Added support for loading Z80 file snapshots.

They can be stored into the z80 folder under the data and kept separately from the sna files.

Author: Florin Muntean

data/z80/Engine.z80

@@ -11,6 +11,7 @@
 extern boolean cfg_demo_mode_on;
 extern unsigned short cfg_demo_every;
 extern String cfg_sna_file_list;
+extern String cfg_z80_file_list;
 extern String cfg_arch;
 extern String cfg_ram_file;
 extern String cfg_rom_set;
@@ -32,9 +33,11 @@ String getAllFilesFrom(const String path);
 void listAllFiles();
 File IRAM_ATTR open_read_file(String filename);
 void IRAM_ATTR load_ram(String sna_file);
+void IRAM_ATTR load_z80(String z80_file);
 String getFileEntriesFromDir(String path);
 unsigned short countFileEntriesFromDir(String path);
 void load_rom(String arch, String romset);
 String getSnaFileList();
+String getz80FileList();
 void config_read();
 void IRAM_ATTR config_save();

include/Disk.h

@@ -1,5 +1,6 @@
 #define DISK_BOOT_FILENAME "/boot.cfg"
 #define DISK_ROM_DIR "/rom"
 #define DISK_SNA_DIR "/sna"
+#define DISK_Z80_DIR "/z80"
 #define NO_RAM_FILE "none"
 #define SIZE48K 49179

include/def/files.h

@@ -32,7 +32,8 @@
 #define OSD_DEMO_MODE_OFF "Demo Mode OFF"
 #define OSD_PAUSE "--=[PAUSED]=--"
 #define MENU_SNA_TITLE "Select Snapshot"
-#define MENU_MAIN "Main Menu\nChange ROM\nChange RAM\nReset\nDemo Mode\nHelp\nReturn\n"
+#define MENU_Z80_TITLE "Select Z80 file to load"
+#define MENU_MAIN "Main Menu\nChange ROM\nChange RAM\nLoad Z80\nReset\nDemo Mode\nHelp\nReturn\n"
 #define MENU_RESET "Reset Menu\nSoft reset\nHard reset\nCancel\n"
 #define MENU_DEMO "Demo mode\nOFF\n 1 minute\n 3 minutes\n 5 minutes\n15 minutes\n30 minutes\n 1 hour\n"
 #define MENU_ARCH "Select Arch\n"

include/def/msg.h

@@ -67,6 +67,7 @@ unsigned short rowCount(String menu);
 String rowGet(String menu, unsigned short row_number);
 // SNA Management
 void changeSna(String sna_filename);
+void loadZ80(String z80_filename);
 void setDemoMode(boolean on, unsigned short every);
 // ULA
 void stepULA();

include/osd.h

@@ -26,6 +26,7 @@ String cfg_arch = "128K";
 String cfg_ram_file = NO_RAM_FILE;
 String cfg_rom_set = "SINCLAIR";
 String cfg_sna_file_list;
+String cfg_z80_file_list;
 boolean cfg_slog_on = true;
 boolean cfg_wconn = false;
 String cfg_wssid = "none";
@@ -252,6 +253,54 @@ void load_ram(String sna_file) {
     KB_INT_START;
 }
 
+
+extern int load_z80_file(File *file);
+
+void load_z80(String z80_file){
+    File lhandle;
+    uint16_t size_read;
+    byte sp_h, sp_l;
+    uint16_t retaddr;
+    int sna_size;
+    zx_reset();
+
+    Serial.printf("%s Z80: %ub\n", MSG_FREE_HEAP_BEFORE, ESP.getFreeHeap());
+
+    KB_INT_STOP;
+
+    lhandle = open_read_file(z80_file);
+    sna_size = lhandle.size();
+
+    if (cfg_arch == "48K") {
+        rom_latch = 0;
+        rom_in_use = 0;
+        bank_latch = 0;
+        paging_lock = 1;
+    }
+    if (sna_size < 50000 && cfg_arch != "48K") {
+        rom_in_use = 1;
+        rom_latch = 1;
+        paging_lock = 1;
+        bank_latch = 0;
+        video_latch = 0;
+        paging_lock = 1;
+        bank_latch = 0;
+        video_latch = 0;
+    }
+    size_read = 0;
+
+    int ret = load_z80_file(&lhandle);
+
+    lhandle.close();
+
+   
+    Serial.printf("%s SNA: %u\n", MSG_FREE_HEAP_AFTER, ESP.getFreeHeap());
+    Serial.printf("Ret address: %x Stack: %x AF: %x Border: %x sna_size: %d rom: %d bank: %x\n", _zxCpu.pc,
+                  _zxCpu.registers.word[Z80_SP], _zxCpu.registers.word[Z80_AF], borderTemp, sna_size, rom_in_use,
+                  bank_latch);
+    KB_INT_START;
+}
+
 String getFileEntriesFromDir(String path) {
     KB_INT_STOP;
     Serial.printf("Getting entries from: '%s'\n", path.c_str());
@@ -340,6 +389,8 @@ void load_rom(String arch, String romset) {
 // Get all sna files
 String getSnaFileList() { return getFileEntriesFromDir(DISK_SNA_DIR); }
 
+String getz80FileList() { return getFileEntriesFromDir(DISK_Z80_DIR); }
+
 // Read config from FS
 void config_read() {
     KB_INT_STOP;
@@ -393,6 +444,7 @@ void config_read() {
     cfg_f.close();
     Serial.println("Config file loaded OK");
     cfg_sna_file_list = (String)MENU_SNA_TITLE + "\n" + getSnaFileList();
+    cfg_z80_file_list = (String)MENU_Z80_TITLE+"\n"+getz80FileList();
     KB_INT_START;
 }
 

src/Disk.cpp

@@ -82,6 +82,15 @@ void do_OSD() {
                 changeSna(rowGet(cfg_sna_file_list, snanum));
             }
         } else if (opt == 3) {
+            //load Z80 files
+            unsigned short snanum = menuRun(cfg_z80_file_list);
+            if (snanum > 0) {
+                if (cfg_demo_mode_on) {
+                    setDemoMode(OFF, 0);
+                }
+                loadZ80(rowGet(cfg_z80_file_list, snanum));
+            }
+        } else if (opt == 4) {
             // Reset
             byte opt2 = menuRun(MENU_RESET);
             if (opt2 == 1) {
@@ -95,7 +104,7 @@ void do_OSD() {
                 config_save();
                 zx_reset();
             }
-        } else if (opt == 4) {
+        } else if (opt == 5) {
             // Demo mode
             byte opt2 = menuRun(MENU_DEMO);
             if (opt2 == 1) {
@@ -124,7 +133,7 @@ void do_OSD() {
                 }
             }
             vTaskDelay(500);
-        } else if (opt == 5) {
+        } else if (opt == 6) {
             // Help
             drawOSD();
             osdAt(2, 0);

src/OSD/osd.cpp

@@ -15,6 +15,13 @@ void changeSna(String sna_filename) {
     config_save();
 }
 
+void loadZ80(String z80_filename){
+    osdCenteredMsg((String)MSG_LOADING + ": " + z80_filename, LEVEL_INFO);
+    zx_reset();
+    Serial.printf("Loading z80: %s\n", z80_filename.c_str());
+    load_z80((String)DISK_Z80_DIR + "/" + z80_filename);
+}
+
 // Demo mode on off
 void setDemoMode(boolean on, unsigned short every) {
     cfg_demo_mode_on = on;