From dea718c4cd187f725a299fa40b03608c99925038 Mon Sep 17 00:00:00 2001 From: sorgelig Date: Thu, 11 Jul 2019 16:07:20 +0800 Subject: [PATCH] Minimig: 56MB option. --- menu.cpp | 9 +++++---- support/minimig/minimig_config.cpp | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/menu.cpp b/menu.cpp index 56a7ea5..315d3ef 100644 --- a/menu.cpp +++ b/menu.cpp @@ -177,7 +177,7 @@ const char *config_tos_usb[] = { "none", "control", "debug", "serial", "parallel const char *config_memory_chip_msg[] = { "512K", "1M", "1.5M", "2M" }; const char *config_memory_slow_msg[] = { "none", "512K", "1M", "1.5M" }; -const char *config_memory_fast_msg[] = { "none", "2M", "4M", "24M" }; +const char *config_memory_fast_msg[] = { "none", "2M", "4M", "24M", "56M" }; const char *config_scanlines_msg[] = { "off", "dim", "black" }; const char *config_ar_msg[] = { "4:3", "16:9" }; @@ -3276,7 +3276,7 @@ void HandleUI(void) minimig_config.hardfile[2].enabled || minimig_config.hardfile[3].enabled)) ? "/HD" : "", config_memory_chip_msg[minimig_config.memory & 0x03], - config_memory_fast_msg[(minimig_config.memory >> 4) & 0x03], + config_memory_fast_msg[((minimig_config.memory >> 4) & 0x03) | ((minimig_config.memory&0x80) >> 5)], ((minimig_config.memory >> 2) & 0x03) ? "+" : "", ((minimig_config.memory >> 2) & 0x03) ? config_memory_slow_msg[(minimig_config.memory >> 2) & 0x03] : "", (minimig_config.memory & 0x40) ? " HRT" : "" @@ -3446,7 +3446,7 @@ void HandleUI(void) strcat(s, config_memory_chip_msg[minimig_config.memory & 0x03]); OsdWrite(1, s, menusub == 0, 0); strcpy(s, " FAST : "); - strcat(s, config_memory_fast_msg[(minimig_config.memory >> 4) & 0x03]); + strcat(s, config_memory_fast_msg[((minimig_config.memory >> 4) & 0x03) | ((minimig_config.memory&0x80) >> 5)]); OsdWrite(2, s, menusub == 1, 0); strcpy(s, " SLOW : "); strcat(s, config_memory_slow_msg[(minimig_config.memory >> 2) & 0x03]); @@ -3478,7 +3478,8 @@ void HandleUI(void) } else if (menusub == 1) { - minimig_config.memory = ((minimig_config.memory + 0x10) & 0x30) | (minimig_config.memory & ~0x30); + uint8_t c = (minimig_config.memory & 0x80) ? 0 : ((minimig_config.memory & 0x30) + 0x10); + minimig_config.memory = (c & 0x30) | ((c<<1) & 0x80) | (minimig_config.memory & ~0xB0); menustate = MENU_SETTINGS_MEMORY1; } else if (menusub == 2) diff --git a/support/minimig/minimig_config.cpp b/support/minimig/minimig_config.cpp index b69cd0c..cbe58d2 100644 --- a/support/minimig/minimig_config.cpp +++ b/support/minimig/minimig_config.cpp @@ -301,7 +301,7 @@ static void ApplyConfiguration(char reloadkickstart) printf("CPU clock : %s\n", minimig_config.chipset & 0x01 ? "turbo" : "normal"); printf("Chip RAM size : %s\n", config_memory_chip_msg[minimig_config.memory & 0x03]); printf("Slow RAM size : %s\n", config_memory_slow_msg[minimig_config.memory >> 2 & 0x03]); - printf("Fast RAM size : %s\n", config_memory_fast_msg[minimig_config.memory >> 4 & 0x03]); + printf("Fast RAM size : %s\n", config_memory_fast_msg[((minimig_config.memory >> 4) & 0x03) | ((minimig_config.memory & 0x80) >> 5)]); printf("Floppy drives : %u\n", minimig_config.floppy.drives + 1); printf("Floppy speed : %s\n", minimig_config.floppy.speed ? "fast" : "normal"); @@ -464,7 +464,7 @@ int minimig_cfg_load(int num) char cfg_str[256]; sprintf(cfg_str, "CPU: %s, Chipset: %s, ChipRAM: %s, FastRAM: %s, SlowRAM: %s", config_cpu_msg[minimig_config.cpu & 0x03], config_chipset_msg[(minimig_config.chipset >> 2) & 7], - config_memory_chip_msg[(minimig_config.memory >> 0) & 0x03], config_memory_fast_msg[(minimig_config.memory >> 4) & 0x03], config_memory_slow_msg[(minimig_config.memory >> 2) & 0x03] + config_memory_chip_msg[(minimig_config.memory >> 0) & 0x03], config_memory_fast_msg[((minimig_config.memory >> 4) & 0x03) | ((minimig_config.memory & 0x80) >> 5)], config_memory_slow_msg[(minimig_config.memory >> 2) & 0x03] ); BootPrintEx(cfg_str);