vice-emu-commit Mailing List for VICE (Page 6)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 45673
          http://sourceforge.net/p/vice-emu/code/45673
Author:   gpz
Date:     2025-05-12 15:33:17 +0000 (Mon, 12 May 2025)
Log Message:
-----------
some minimon fixes, better handling of the case when no rom image is attached at startup

Modified Paths:
--------------
    trunk/vice/src/vic20/cart/minimon.c

Modified: trunk/vice/src/vic20/cart/minimon.c
===================================================================

--- trunk/vice/src/vic20/cart/minimon.c	2025-05-12 05:23:26 UTC (rev 45672)
+++ trunk/vice/src/vic20/cart/minimon.c	2025-05-12 15:33:17 UTC (rev 45673)
@@ -179,6 +179,48 @@
 
 /* ------------------------------------------------------------------------- */
 
+static int minimon_rom_reload(char *filename);
+
+/* FIXME: this still needs to be tweaked to match the hardware */
+static RAMINITPARAM ramparam = {
+    .start_value = 255,
+    .value_invert = 2,
+    .value_offset = 1,
+
+    .pattern_invert = 0x100,
+    .pattern_invert_value = 255,
+
+    .random_start = 0,
+    .random_repeat = 0,
+    .random_chance = 0,
+};
+
+static void clear_ram(void)
+{
+    DBG(("clear_rom: clear buffer with RAM pattern"));
+    ram_init_with_pattern(minimon_rom, CART_ROM_SIZE, &ramparam);
+}
+
+static void clear_eprom(void)
+{
+    DBG(("clear_rom: clear buffer with EPROM pattern"));
+    memset(minimon_rom, CART_ROM_SIZE, 0xff);
+}
+
+static void allocate_rom(void)
+{
+    if (!minimon_rom) {
+        DBG(("allocate_rom: allocate buffer"));
+        minimon_rom = lib_malloc(CART_ROM_SIZE);
+        clear_ram();
+        if (minimon_image_filename) {
+            minimon_rom_reload(minimon_image_filename);
+        }
+    }
+}
+
+/* ------------------------------------------------------------------------- */
+
 /* Some prototypes are needed */
 static uint8_t minimon_io2_read(uint16_t addr);
 static uint8_t minimon_io3_read(uint16_t addr);
@@ -231,6 +273,9 @@
 /* (only) register the io devices */
 static int io_register(void)
 {
+    DBG(("io_register"));
+    allocate_rom();
+
     /* HACK: mem_cart_blocks is reserved for main slot */
     minimon_io23_temp = mem_cart_blocks & (VIC_CART_IO2 | VIC_CART_IO3);
     mem_cart_blocks |= (VIC_CART_IO2 | VIC_CART_IO3);
@@ -251,6 +296,7 @@
 /* (only) un-register the io devices */
 static int io_unregister(void)
 {
+    DBG(("io_unregister"));
     if (minimon_io2_list_item != NULL) {
         io_source_unregister(minimon_io2_list_item);
         minimon_io2_list_item = NULL;
@@ -321,30 +367,6 @@
 /* ------------------------------------------------------------------------- */
 
 
-/* FIXME: this still needs to be tweaked to match the hardware */
-static RAMINITPARAM ramparam = {
-    .start_value = 255,
-    .value_invert = 2,
-    .value_offset = 1,
-
-    .pattern_invert = 0x100,
-    .pattern_invert_value = 255,
-
-    .random_start = 0,
-    .random_repeat = 0,
-    .random_chance = 0,
-};
-
-static void allocate_rom(void)
-{
-    if (!minimon_rom) {
-        DBG(("allocate_rom: allocate buffer"));
-        minimon_rom = lib_malloc(CART_ROM_SIZE);
-    }
-    DBG(("allocate_rom: clear buffer with pattern"));
-    ram_init_with_pattern(minimon_rom, CART_ROM_SIZE, &ramparam);
-}
-
 void minimon_freeze(void)
 {
     DBG(("minimon_freeze"));
@@ -425,16 +447,18 @@
 /* set the MinimonFilename resource */
 static int set_minimon_image_filename(const char *name, void *param)
 {
+    DBG(("set_minimon_image_filename '%s'", name));
     if (minimon_image_filename != NULL && name != NULL && strcmp(name, minimon_image_filename) == 0) {
         return 0;
     }
 
-    if (name != NULL && *name != '\0') {
+    if ((name != NULL) && (*name != '\0')) {
         if (util_check_filename_access(name) < 0) {
             return -1;
         }
     }
 
+    DBG(("set_minimon_image_filename"));
     if (minimon_enabled) {
         minimon_flush_image();
         util_string_set(&minimon_image_filename, name);
@@ -442,6 +466,8 @@
         util_string_set(&minimon_image_filename, name);
     }
 
+    /* FIXME: load new image */
+
     return 0;
 }
 
@@ -463,6 +489,15 @@
 
     DBG(("set_minimon_enabled: %d to %d", minimon_enabled, val));
     if (val) {
+
+        /* prepare the RAM/ROM */
+        if (minimon_rom) {
+            clear_ram();
+            if (minimon_image_filename) {
+                minimon_rom_reload(minimon_image_filename);
+            }
+        }
+
         /* enable cartridge */
         if (export_add(&export_res23) < 0) {
             return -1;
@@ -470,6 +505,7 @@
         if (minimon_io_enabled) {
             io_register();
         }
+        /* FIXME: minimon_reload_file(); */
         minimon_alarm_install();
     } else {
         /* disable cartridge */
@@ -578,11 +614,62 @@
     return 0;
 }
 
+static int minimon_rom_reload(char *filename)
+{
+    crt_header_t header;
+    crt_chip_header_t chip;
+    FILE *fd = NULL;
+
+    DBG(("minimon_rom_attach"));
+
+    clear_eprom();
+    if (minimon_bios_type != CARTRIDGE_FILETYPE_BIN) {
+        fd = crt_open(filename, &header);
+
+        if (fd == NULL) {
+            return -1;
+        }
+        if (crt_read_chip_header(&chip, fd)) {
+            fclose(fd);
+            goto trybinary;
+        }
+
+        if (chip.size != CART_ROM_SIZE) {
+            fclose(fd);
+            goto trybinary;
+        }
+
+        if (crt_read_chip(&minimon_rom[0], 0, &chip, fd)) {
+            fclose(fd);
+            goto trybinary;
+        }
+
+        minimon_bios_type = CARTRIDGE_FILETYPE_CRT;
+        DBG(("minimon_rom_attach (loaded: crt)"));
+        fclose(fd);
+        return 0;
+    }
+trybinary:
+
+    if (minimon_bios_type != CARTRIDGE_FILETYPE_CRT) {
+        if (zfile_load(filename, minimon_rom, (size_t)CART_ROM_SIZE) < 0) {
+            return -1;
+        }
+        minimon_bios_type  = CARTRIDGE_FILETYPE_BIN;
+        DBG(("minimon_rom_attach (loaded: bin)"));
+        return 0;
+    }
+    return -1;
+}
+
 int minimon_crt_attach(FILE *fd, uint8_t *rawcart)
 {
     crt_chip_header_t chip;
 
+    DBG(("minimon_crt_attach"));
+
     allocate_rom();
+    clear_eprom();
 
     if (crt_read_chip_header(&chip, fd)) {
         goto exiterror;
@@ -606,6 +693,9 @@
     minimon_enabled = 1; /* resource */
     minimon_io_enabled = 1; /* resource */
 
+    minimon_bios_type = CARTRIDGE_FILETYPE_CRT;
+    /* FIXME: set_minimon_image_filename(filename, NULL); */ /* set the resource */
+
     minimon_alarm_install();
 
     return CARTRIDGE_VIC20_MINIMON;
@@ -617,7 +707,10 @@
 
 int minimon_bin_attach(const char *filename, uint8_t *rawcart)
 {
+    DBG(("minimon_bin_attach"));
+
     allocate_rom();
+    clear_eprom();
 
     if (zfile_load(filename, minimon_rom, (size_t)CART_ROM_SIZE) < 0) {
         minimon_detach();
@@ -699,32 +792,6 @@
     return -1;
 }
 
-#if 0
-static int minimon_activate(void)
-{
-    minimon_bios_changed = 0;
-    /* mmc64_reset(); */
-    return 0;
-}
-
-static int minimon_deactivate(void)
-{
-    int ret;
-
-    if (minimon_bios_changed &&minimon_bios_write) {
-        if (minimon_bios_type == CARTRIDGE_FILETYPE_CRT) {
-            ret = minimon_crt_save(minimon_bios_filename);
-        } else {
-            ret = minimon_bin_save(minimon_bios_filename);
-        }
-        if (ret <= 0) {
-            return 0; /* FIXME */
-        }
-    }
-    return 0;
-}
-#endif
-
 int minimon_flush_image(void)
 {
     /* FIXME */
@@ -768,6 +835,7 @@
     return set_minimon_enabled(0, (void*)1); /* setup the resource */
 }
 
+
 /* ------------------------------------------------------------------------- */
 
 /* MINIMON snapshot module format:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2008	Jan	Feb	Mar	Apr (38)	May (60)	Jun (122)	Jul (148)	Aug (178)	Sep (151)	Oct (131)	Nov (208)	Dec (129)
2009	Jan (193)	Feb (209)	Mar (221)	Apr (243)	May (165)	Jun (168)	Jul (198)	Aug (161)	Sep (103)	Oct (98)	Nov (168)	Dec (99)
2010	Jan (263)	Feb (156)	Mar (57)	Apr (93)	May (85)	Jun (124)	Jul (57)	Aug (58)	Sep (113)	Oct (148)	Nov (114)	Dec (193)
2011	Jan (200)	Feb (207)	Mar (91)	Apr (91)	May (142)	Jun (104)	Jul (115)	Aug (137)	Sep (266)	Oct (91)	Nov (85)	Dec (186)
2012	Jan (98)	Feb (146)	Mar (160)	Apr (99)	May (59)	Jun (257)	Jul (84)	Aug (103)	Sep (169)	Oct (206)	Nov (90)	Dec (296)
2013	Jan (294)	Feb (130)	Mar (36)	Apr (14)	May (51)	Jun (74)	Jul (180)	Aug (85)	Sep (26)	Oct (45)	Nov (29)	Dec (21)
2014	Jan (56)	Feb (40)	Mar (57)	Apr (30)	May (31)	Jun (11)	Jul (107)	Aug (135)	Sep (142)	Oct (195)	Nov (139)	Dec (133)
2015	Jan (293)	Feb (161)	Mar (146)	Apr (85)	May (139)	Jun (51)	Jul (21)	Aug (24)	Sep (29)	Oct (136)	Nov (212)	Dec (118)
2016	Jan (119)	Feb (165)	Mar (229)	Apr (219)	May (134)	Jun (119)	Jul (134)	Aug (236)	Sep (203)	Oct (215)	Nov (300)	Dec (140)
2017	Jan (188)	Feb (20)	Mar (147)	Apr (198)	May (26)	Jun (21)	Jul (67)	Aug (219)	Sep (209)	Oct (194)	Nov (144)	Dec (99)
2018	Jan (139)	Feb (122)	Mar (116)	Apr (85)	May (232)	Jun (181)	Jul (190)	Aug (105)	Sep (92)	Oct (178)	Nov (105)	Dec (86)
2019	Jan (119)	Feb (79)	Mar (74)	Apr (117)	May (115)	Jun (307)	Jul (107)	Aug (131)	Sep (103)	Oct (60)	Nov (118)	Dec (70)
2020	Jan (114)	Feb (103)	Mar (77)	Apr (121)	May (193)	Jun (110)	Jul (214)	Aug (210)	Sep (179)	Oct (260)	Nov (237)	Dec (334)
2021	Jan (163)	Feb (186)	Mar (58)	Apr (81)	May (108)	Jun (175)	Jul (154)	Aug (180)	Sep (217)	Oct (204)	Nov (232)	Dec (190)
2022	Jan (253)	Feb (134)	Mar (229)	Apr (190)	May (125)	Jun (70)	Jul (8)	Aug (22)	Sep (19)	Oct (33)	Nov (94)	Dec (164)
2023	Jan (158)	Feb (366)	Mar (272)	Apr (109)	May (198)	Jun (226)	Jul (200)	Aug (94)	Sep (108)	Oct (62)	Nov (175)	Dec (116)
2024	Jan (35)	Feb (40)	Mar (51)	Apr (89)	May (24)	Jun (26)	Jul (53)	Aug (71)	Sep (23)	Oct (11)	Nov (22)	Dec (58)
2025	Jan (26)	Feb (40)	Mar (107)	Apr (39)	May (35)	Jun (20)	Jul (11)	Aug (24)	Sep (35)	Oct (18)	Nov	Dec

vice-emu-commit Mailing List for VICE (Page 6)

Versatile Commodore Emulator

vice-emu-commit — Commit notifications for the source server