From 65a9ef415243123eb52f172099a775d183d81495 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Sun, 13 Oct 2024 14:34:37 +0200 Subject: [PATCH] --debug-revision deemed useless --- src/cpu.c | 1 - src/debug.h | 4 ++-- src/modules.c | 1 - src/ui4x/config.c | 34 +++++++++++++++++----------------- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/cpu.c b/src/cpu.c index 978a5e5..a726519 100644 --- a/src/cpu.c +++ b/src/cpu.c @@ -2472,7 +2472,6 @@ void CpuReset( void ) void CpuInit( void ) { debug1( CPU_CHF_MODULE_ID, DEBUG_C_TRACE, CPU_I_CALLED, "CpuInit" ); - debug1( CPU_CHF_MODULE_ID, DEBUG_C_REVISION, CPU_I_REVISION, CPU_RCS_INFO ); if ( ReadStructFromFile( config.cpu_file_name, sizeof( cpu_status ), &cpu_status ) ) { ChfGenerate( CPU_CHF_MODULE_ID, __FILE__, __LINE__, CPU_W_RESETTING, CHF_WARNING ); diff --git a/src/debug.h b/src/debug.h index 9ada6c6..285dc1d 100644 --- a/src/debug.h +++ b/src/debug.h @@ -133,8 +133,8 @@ #define DEBUG_C_IMPLEMENTATION 0x0100 /* Feature implementation */ #define DEBUG_C_FLASH 0x0080 /* 3.3: Flash ROM */ #define DEBUG_C_X_FUNC 0x0040 /* 3.13: Extended functions */ -#define DEBUG_C_REVISION 0x0010 /* Revision information */ -#define DEBUG_C_OPCODES 0x0001 /* OpCodes */ +#define DEBUG_C_XX 0x0010 +#define DEBUG_C_OPCODES 0x0001 /* OpCodes */ #define DEBUG_C_NONE 0 /*--------------------------------------------------------------------------- diff --git a/src/modules.c b/src/modules.c index 058014a..2db5480 100644 --- a/src/modules.c +++ b/src/modules.c @@ -942,7 +942,6 @@ void ModInit( void ) int mod; debug1( MOD_CHF_MODULE_ID, DEBUG_C_TRACE, MOD_I_CALLED, "ModInit" ); - debug1( MOD_CHF_MODULE_ID, DEBUG_C_REVISION, MOD_I_REVISION, MOD_RCS_INFO ); /* First, a little sanity check on mod_description: ensure that ModRegisterDescription() has been called at least once with a diff --git a/src/ui4x/config.c b/src/ui4x/config.c index 9ccd2b8..49cca55 100644 --- a/src/ui4x/config.c +++ b/src/ui4x/config.c @@ -48,7 +48,7 @@ static config_t config = { .reset = false, .monitor = false, .batchXfer = false, - .state_dir_path = ".", + .state_dir_path = ( char* )".", .debug_level = DEBUG_C_NONE, }; @@ -193,14 +193,14 @@ config_t* config_init( int argc, char* argv[] ) int option_index; int c = '?'; - char* config_file_name = "config.lua"; - char* mod_file_name = "mod"; - char* cpu_file_name = "cpu"; - char* hdw_file_name = "hdw"; - char* rom_file_name = "rom"; - char* ram_file_name = "ram"; - char* port_1_file_name = "port1"; - char* port_2_file_name = "port2"; + char* config_file_name = ( char* )"config.lua"; + char* mod_file_name = ( char* )"mod"; + char* cpu_file_name = ( char* )"cpu"; + char* hdw_file_name = ( char* )"hdw"; + char* rom_file_name = ( char* )"rom"; + char* ram_file_name = ( char* )"ram"; + char* port_1_file_name = ( char* )"port1"; + char* port_2_file_name = ( char* )"port2"; int print_config_and_exit = false; @@ -223,7 +223,7 @@ config_t* config_init( int argc, char* argv[] ) int clopt_reset = -1; int clopt_monitor = -1; /* int clopt_batchXfer = -1; */ - char* clopt_state_dir_path = "."; + char* clopt_state_dir_path = ( char* )"."; const char* optstring = "h"; struct option long_options[] = { @@ -260,7 +260,7 @@ config_t* config_init( int argc, char* argv[] ) {"gray", no_argument, &clopt_gray, true }, {"debug-opcodes", no_argument, NULL, 38601 }, - {"debug-revision", no_argument, NULL, 38602 }, + /* {"debug-xx", no_argument, NULL, 38602 }, */ {"debug-x-func", no_argument, NULL, 38603 }, {"debug-flash", no_argument, NULL, 38604 }, {"debug-implementation", no_argument, NULL, 38605 }, @@ -311,15 +311,15 @@ config_t* config_init( int argc, char* argv[] ) " --monitor start with monitor (default: no)\n" "\n" " --debug-opcodes enables debugging opcodes (default: no)\n" - " --debug-revision enables debugging revision (default: no)\n" + /* " --debug- enables debugging something (default: no)\n" */ " --debug-x-func enables debugging extended functions (default: no)\n" " --debug-flash enables debugging flash (default: no)\n" - " --debug-implementation enables debugging implementation (default: no)\n" + " --debug-implementation enables debugging implementation (default: no) (UNUSED)\n" " --debug-mod-cache enables debugging mod cache (default: no)\n" " --debug-serial enables debugging serial (default: no)\n" " --debug-timers enables debugging timers (default: no)\n" " --debug-interruptions enables debugging interruptions (default: no)\n" - " --debug-display enables debugging display (default: no)\n" + " --debug-display enables debugging display (default: no) (UNUSED)\n" " --debug-modules enables debugging modules (default: no)\n" " --debug-trace enables debugging trace (default: no)\n"; @@ -349,9 +349,9 @@ config_t* config_init( int argc, char* argv[] ) case 38601: config.debug_level |= DEBUG_C_OPCODES; break; - case 38602: - config.debug_level |= DEBUG_C_REVISION; - break; + /* case 38602: */ + /* config.debug_level |= DEBUG_C_XX; */ + /* break; */ case 38603: config.debug_level |= DEBUG_C_X_FUNC; break;