From 66c64502522f8b6e3be7d5e98c7df67eb2693a01 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Tue, 24 Sep 2024 20:23:21 +0200 Subject: [PATCH] disable file related params --- dist/saturn40g | 10 ++-- dist/saturn48gx | 18 +++--- dist/saturn49g | 10 ++-- src/ui48_config.c | 136 +++++++++++++++++++++++++--------------------- 4 files changed, 92 insertions(+), 82 deletions(-) diff --git a/dist/saturn40g b/dist/saturn40g index 45af98a..13648d1 100755 --- a/dist/saturn40g +++ b/dist/saturn40g @@ -8,7 +8,7 @@ STATE_HOME=${XDG_STATE_HOME:-$HOME/.local/state} STATEDIR=$STATE_HOME/saturn/40g mkdir -p "$STATEDIR" -if [ ! -e "$STATEDIR"/rom.39g ]; then +if [ ! -e "$STATEDIR"/rom ]; then if [ ! -d ../share/saturn/ROMs/ ]; then echo "Error: No ROMs/ dir found" exit 1 @@ -17,12 +17,12 @@ if [ ! -e "$STATEDIR"/rom.39g ]; then cp -R ../share/saturn/ROMs/ "$STATEDIR"/../ROMs fi make -C "$STATEDIR"/../ROMs rom.39g - cp "$STATEDIR"/../ROMs/rom.39g "$STATEDIR"/rom.39g + cp "$STATEDIR"/../ROMs/rom.39g "$STATEDIR"/rom fi -RAM='' +RESET='' if [ ! -e "$STATEDIR"/ram ]; then - RAM=-reset + RESET=-reset fi -./saturn --hw hp40 --40g --state-dir "$STATEDIR" --rom rom.39g "$RAM" --mod mod --cpu cpu --hdw hdw "$@" +./saturn --40g --state-dir "$STATEDIR" "$RESET" "$@" diff --git a/dist/saturn48gx b/dist/saturn48gx index 1155c6a..178edd9 100755 --- a/dist/saturn48gx +++ b/dist/saturn48gx @@ -8,7 +8,7 @@ STATE_HOME=${XDG_STATE_HOME:-$HOME/.local/state} STATEDIR=$STATE_HOME/saturn/48gx mkdir -p "$STATEDIR" -if [ ! -e "$STATEDIR"/gxrom-r ]; then +if [ ! -e "$STATEDIR"/rom ]; then if [ ! -d ../share/saturn/ROMs/ ]; then echo "Error: No ROMs/ dir found" exit 1 @@ -17,17 +17,15 @@ if [ ! -e "$STATEDIR"/gxrom-r ]; then cp -R ../share/saturn/ROMs/ "$STATEDIR"/../ROMs fi make -C "$STATEDIR"/../ROMs gxrom-r - cp "$STATEDIR"/../ROMs/gxrom-r "$STATEDIR"/gxrom-r -fi - -RAM='' -if [ ! -e "$STATEDIR"/ram ]; then - RAM=--reset -else - RAM="--ram ram" + cp "$STATEDIR"/../ROMs/gxrom-r "$STATEDIR"/rom fi [ ! -e "$STATEDIR"/port1 ] && dd if=/dev/zero of="$STATEDIR"/port1 bs=1k count=128 [ ! -e "$STATEDIR"/port2 ] && dd if=/dev/zero of="$STATEDIR"/port2 bs=1k count=4096 -./saturn --hw hp48 --48gx --state-dir "$STATEDIR" --rom gxrom-r "$RAM" --port1 port1 --port2 port2 --mod mod --cpu cpu --hdw hdw "$@" +RESET='' +if [ ! -e "$STATEDIR"/ram ]; then + RESET=--reset +fi + +./saturn --48gx --state-dir "$STATEDIR" "$RESET" "$@" diff --git a/dist/saturn49g b/dist/saturn49g index 6385893..df63366 100755 --- a/dist/saturn49g +++ b/dist/saturn49g @@ -8,7 +8,7 @@ STATE_HOME=${XDG_STATE_HOME:-$HOME/.local/state} STATEDIR=$STATE_HOME/saturn/49g mkdir -p "$STATEDIR" -if [ ! -e "$STATEDIR"/rom.49g ]; then +if [ ! -e "$STATEDIR"/rom ]; then if [ ! -d ../share/saturn/ROMs/ ]; then echo "Error: No ROMs/ dir found" exit 1 @@ -17,12 +17,12 @@ if [ ! -e "$STATEDIR"/rom.49g ]; then cp -R ../share/saturn/ROMs/ "$STATEDIR"/../ROMs fi make -C "$STATEDIR"/../ROMs rom.49g - cp "$STATEDIR"/../ROMs/rom.49g "$STATEDIR"/rom.49g + cp "$STATEDIR"/../ROMs/rom.49g "$STATEDIR"/rom fi -RAM='' +RESET='' if [ ! -e "$STATEDIR"/ram ]; then - RAM=-reset + RESET=-reset fi -./saturn --hw hp49 --49g --state-dir "$STATEDIR" --rom rom.49g "$RAM" --mod mod --cpu cpu --hdw hdw "$@" +./saturn --49g --state-dir "$STATEDIR" "$RESET" "$@" diff --git a/src/ui48_config.c b/src/ui48_config.c index 4617212..8d1bb98 100644 --- a/src/ui48_config.c +++ b/src/ui48_config.c @@ -82,16 +82,16 @@ 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_mod_file_name; - char* clopt_cpu_file_name; - char* clopt_hdw_file_name; - char* clopt_rom_file_name; - char* clopt_ram_file_name; - char* clopt_port_1_file_name; - char* clopt_port_2_file_name; - char* clopt_hw; + /* int clopt_batchXfer = -1; */ + char* clopt_state_dir_path = "."; + /* char* clopt_mod_file_name = "mod"; */ + /* char* clopt_cpu_file_name = "cpu"; */ + /* char* clopt_hdw_file_name = "hdw"; */ + /* char* clopt_rom_file_name = "gxrom-r"; */ + /* char* clopt_ram_file_name = "ram"; */ + /* char* clopt_port_1_file_name = "port1"; */ + /* char* clopt_port_2_file_name = "port2"; */ + /* char* clopt_hw = "hp48"; */ const char* optstring = "h"; struct option long_options[] = { @@ -115,16 +115,16 @@ config_t* config_init( int argc, char* argv[] ) {"reset", no_argument, &clopt_reset, true }, {"monitor", no_argument, &clopt_monitor, true }, - {"batchXfer", no_argument, &clopt_batchXfer, true }, + /* {"batchXfer", no_argument, &clopt_batchXfer, true }, */ {"state-dir", required_argument, NULL, 8999 }, - {"mod", required_argument, NULL, 8000 }, - {"cpu", required_argument, NULL, 8010 }, - {"hdw", required_argument, NULL, 8020 }, - {"rom", required_argument, NULL, 8030 }, - {"ram", required_argument, NULL, 8040 }, - {"port1", required_argument, NULL, 8050 }, - {"port2", required_argument, NULL, 8060 }, - {"hw", required_argument, NULL, 8070 }, + /* {"mod", required_argument, NULL, 8000 }, */ + /* {"cpu", required_argument, NULL, 8010 }, */ + /* {"hdw", required_argument, NULL, 8020 }, */ + /* {"rom", required_argument, NULL, 8030 }, */ + /* {"ram", required_argument, NULL, 8040 }, */ + /* {"port1", required_argument, NULL, 8050 }, */ + /* {"port2", required_argument, NULL, 8060 }, */ + /* {"hw", required_argument, NULL, 8070 }, */ {0, 0, 0, 0 } }; @@ -177,30 +177,30 @@ config_t* config_init( int argc, char* argv[] ) case 8999: clopt_state_dir_path = optarg; break; - case 8000: - clopt_mod_file_name = optarg; - break; - case 8010: - clopt_cpu_file_name = optarg; - break; - case 8020: - clopt_hdw_file_name = optarg; - break; - case 8030: - clopt_rom_file_name = optarg; - break; - case 8040: - clopt_ram_file_name = optarg; - break; - case 8050: - clopt_port_1_file_name = optarg; - break; - case 8060: - clopt_port_2_file_name = optarg; - break; - case 8070: - clopt_hw = optarg; - break; + /* case 8000: */ + /* clopt_mod_file_name = optarg; */ + /* break; */ + /* case 8010: */ + /* clopt_cpu_file_name = optarg; */ + /* break; */ + /* case 8020: */ + /* clopt_hdw_file_name = optarg; */ + /* break; */ + /* case 8030: */ + /* clopt_rom_file_name = optarg; */ + /* break; */ + /* case 8040: */ + /* clopt_ram_file_name = optarg; */ + /* break; */ + /* case 8050: */ + /* clopt_port_1_file_name = optarg; */ + /* break; */ + /* case 8060: */ + /* clopt_port_2_file_name = optarg; */ + /* break; */ + /* case 8070: */ + /* clopt_hw = optarg; */ + /* break; */ default: break; @@ -244,28 +244,40 @@ config_t* config_init( int argc, char* argv[] ) config.reset = clopt_reset; if ( clopt_monitor != -1 ) config.monitor = clopt_monitor; - if ( clopt_batchXfer != -1 ) - config.batchXfer = clopt_batchXfer; + /* if ( clopt_batchXfer != -1 ) */ + /* config.batchXfer = clopt_batchXfer; */ if ( clopt_state_dir_path != NULL ) config.state_dir_path = strdup( clopt_state_dir_path ); - if ( clopt_mod_file_name != NULL ) - config.mod_file_name = strdup( clopt_mod_file_name ); - if ( clopt_cpu_file_name != NULL ) - config.cpu_file_name = strdup( clopt_cpu_file_name ); - if ( clopt_hdw_file_name != NULL ) - config.hdw_file_name = strdup( clopt_hdw_file_name ); - if ( clopt_rom_file_name != NULL ) - config.rom_file_name = strdup( clopt_rom_file_name ); - if ( clopt_ram_file_name != NULL ) - config.ram_file_name = strdup( clopt_ram_file_name ); - if ( clopt_port_1_file_name != NULL ) - config.port_1_file_name = strdup( clopt_port_1_file_name ); - if ( clopt_port_2_file_name != NULL ) - config.port_2_file_name = strdup( clopt_port_2_file_name ); - if ( clopt_hw != NULL ) - config.hw = strdup( clopt_hw ); + /* if ( clopt_mod_file_name != NULL ) */ + /* config.mod_file_name = strdup( clopt_mod_file_name ); */ + /* if ( clopt_cpu_file_name != NULL ) */ + /* config.cpu_file_name = strdup( clopt_cpu_file_name ); */ + /* if ( clopt_hdw_file_name != NULL ) */ + /* config.hdw_file_name = strdup( clopt_hdw_file_name ); */ + /* if ( clopt_rom_file_name != NULL ) */ + /* config.rom_file_name = strdup( clopt_rom_file_name ); */ + /* if ( clopt_ram_file_name != NULL ) */ + /* config.ram_file_name = strdup( clopt_ram_file_name ); */ + /* if ( clopt_port_1_file_name != NULL ) */ + /* config.port_1_file_name = strdup( clopt_port_1_file_name ); */ + /* if ( clopt_port_2_file_name != NULL ) */ + /* config.port_2_file_name = strdup( clopt_port_2_file_name ); */ + /* if ( clopt_hw != NULL ) */ + /* config.hw = strdup( clopt_hw ); */ - fprintf( stderr, "config.chromeless = %s\n\n", config.chromeless ? "true" : "false" ); + switch ( clopt_model ) { + case MODEL_40G: + config.hw = "hp40"; + break; + case MODEL_49G: + config.hw = "hp49"; + break; + case MODEL_48SX: + case MODEL_48GX: + default: + config.hw = "hp48"; + break; + } return &config; }