eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minimig: update FastRAM options.

Browse Source
This commit is contained in:
sorgelig
2019-09-22 19:02:14 +08:00
parent c073756a3f
commit e00a26a04b
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
menu.cpp
View File

@@ -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", "56M", "280M", "312M" };
const char *config_memory_fast_msg[] = { "none", "2M", "4M", "8M", "256M", "384M", "256M" };
const char *config_scanlines_msg[] = { "off", "dim", "black" };
const char *config_ar_msg[] = { "4:3", "16:9" };
@@ -3498,10 +3498,7 @@ void HandleUI(void)
strcat(s, (minimig_config.memory & 0x40) ? "enabled " : "disabled");
OsdWrite(6, s, menusub == 4, 0);
OsdWrite(7, "", 0, 0);
OsdWrite(8, ((minimig_config.memory & 0x80) && !(minimig_config.memory & 0x10) && !(sdram_sz() & 2)) ? " ** 64MB SDRAM REQUIRED **" : "", 0, 0);
for (int i = 9; i < OsdGetSize() - 1; i++) OsdWrite(i, "", 0, 0);
for (int i = 7; i < OsdGetSize() - 1; i++) OsdWrite(i, "", 0, 0);
OsdWrite(OsdGetSize() - 1, STD_EXIT, menusub == 5, 0);
menustate = MENU_SETTINGS_MEMORY2;
@@ -3518,7 +3515,7 @@ void HandleUI(void)
else if (menusub == 1)
{
uint8_t c = (((minimig_config.memory >> 4) & 0x03) | ((minimig_config.memory & 0x80) >> 5))+1;
if (c > 6) c = 0;
if (c > 5) c = 0;
minimig_config.memory = ((c<<4) & 0x30) | ((c<<5) & 0x80) | (minimig_config.memory & ~0xB0);
menustate = MENU_SETTINGS_MEMORY1;
}

12
support/minimig/minimig_config.cpp
View File

@@ -300,18 +300,6 @@ static void ApplyConfiguration(char reloadkickstart)
printf("CPU clock : %s\n", minimig_config.chipset & 0x01 ? "turbo" : "normal");
uint8_t memcfg = minimig_config.memory;
if (!(sdram_sz() & 2))
{
uint8_t fastram_sz = ((memcfg >> 4) & 0x03) | ((memcfg & 0x80) >> 5);
switch (fastram_sz)
{
case 4:
case 6:
printf("Warning: config requires >=64MB but <=32MB is installed. Lowering down memory config.\n");
fastram_sz--;
memcfg = ((fastram_sz << 4) & 0x30) | ((fastram_sz << 5) & 0x80) | (memcfg & ~0xB0);
}
}
printf("Chip RAM size : %s\n", config_memory_chip_msg[memcfg & 0x03]);
printf("Slow RAM size : %s\n", config_memory_slow_msg[memcfg >> 2 & 0x03]);