From 6dbfe34fc9b18b61df1ad64d01b5cc7d71f65433 Mon Sep 17 00:00:00 2001 From: Alan Steremberg Date: Tue, 29 Jun 2021 15:49:56 -0400 Subject: [PATCH] Fixes for SharpMZ (#417) --- menu.cpp | 4 ++-- menu.h | 3 +++ support/sharpmz/sharpmz.cpp | 7 ++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/menu.cpp b/menu.cpp index d5bf857..08a7a21 100644 --- a/menu.cpp +++ b/menu.cpp @@ -351,7 +351,7 @@ static char filter[256] = {}; static unsigned long filter_typing_timer = 0; // this function displays file selection menu -static void SelectFile(const char* path, const char* pFileExt, unsigned char Options, unsigned char MenuSelect, unsigned char MenuCancel) +void SelectFile(const char* path, const char* pFileExt, unsigned char Options, unsigned char MenuSelect, unsigned char MenuCancel) { printf("pFileExt = %s\n", pFileExt); filter_typing_timer = 0; @@ -1279,7 +1279,7 @@ void HandleUI(void) if (user_io_core_type() == CORE_TYPE_SHARPMZ) sharpmz_ui(MENU_NONE1, MENU_NONE2, MENU_COMMON1, MENU_FILE_SELECT1, &parentstate, &menustate, &menusub, &menusub_last, - &menumask, Selected_F[0], &helptext_idx, helptext_custom, + &menumask, /*Selected_F[0]*/ selPath, &helptext_idx, helptext_custom, &fs_ExtLen, &fs_Options, &fs_MenuSelect, &fs_MenuCancel, fs_pFileExt, menu, select, up, down, diff --git a/menu.h b/menu.h index 1936511..2672cec 100644 --- a/menu.h +++ b/menu.h @@ -3,6 +3,9 @@ #include + +void SelectFile(const char* path, const char* pFileExt, unsigned char Options, unsigned char MenuSelect, unsigned char MenuCancel); + void HandleUI(void); void menu_key_set(unsigned int c); void menu_process_save(); diff --git a/support/sharpmz/sharpmz.cpp b/support/sharpmz/sharpmz.cpp index 7eea156..ed4aca9 100644 --- a/support/sharpmz/sharpmz.cpp +++ b/support/sharpmz/sharpmz.cpp @@ -45,7 +45,7 @@ // Names of the supported machines. // static const char *MZMACHINES[MAX_MZMACHINES] = { "MZ80K", "MZ80C", "MZ1200", "MZ80A", "MZ700", "MZ800", "MZ80B", "MZ2000" }; - +//#define __SHARPMZ_DEBUG__ #if defined __SHARPMZ_DEBUG__ #define sharpmz_debugf(a, ...) printf("\033[1;31mSHARPMZ: " a "\033[0m\n", ##__VA_ARGS__) #define sharpmz_x_debugf(a, ...) printf("\033[1;32mSHARPMZ: " a "\033[0m\n", ##__VA_ARGS__) @@ -144,7 +144,7 @@ int sharpmz_reset_config(short setStatus) // Set the configuration registers to a known defualt. config.system_reg[REGISTER_MODEL] = 0x03; // MZ-80A config.system_reg[REGISTER_DISPLAY] = 0x00; // Mono 40x25 - config.system_reg[REGISTER_DISPLAY2] = 0x78 | 0x00; // GRAM base addr | VGA Mode. + config.system_reg[REGISTER_DISPLAY2] = 0x78 | 0x00; // GRAM base addr | VGA Mode. // 78 - VGA 7B - 15khz config.system_reg[REGISTER_DISPLAY3] = 0x00; // Status screen buffer. config.system_reg[REGISTER_CPU] = 0x00; // CPU speed. config.system_reg[REGISTER_AUDIO] = 0x00; // Audio - sound output. @@ -2627,7 +2627,8 @@ void sharpmz_ui(int idleState, int idle2State, int system case 0: case 1: *fs_Options = SCANO_DIR; - sharpmz_select_file("MZFmzfMZTmzt", *fs_Options, fs_pFileExt, 1, selectedPath); + //sharpmz_select_file("MZFmzfMZTmzt", *fs_Options, fs_pFileExt, 1, selectedPath); + SelectFile("","MZFmzfMZTmzt", *fs_Options, 1,1 ); //sharpmz_select_file("MZFmzf", *fs_Options, fs_pFileExt, 1, selectedPath); *fs_ExtLen = strlen(fs_pFileExt); *fs_MenuSelect = (*menusub == 0 ? MENU_SHARPMZ_TAPE_STORAGE_LOAD_TAPE_TO_RAM : MENU_SHARPMZ_TAPE_STORAGE_QUEUE_TAPE_TO_CMT);