From 5e970fcc755db7f5028108cb53fa99ebc3199af3 Mon Sep 17 00:00:00 2001
From: sorgelig <pour.garbage@gmail.com>
Date: Wed, 17 Jul 2019 17:25:55 +0800
Subject: [PATCH] Minimig: fix reset by I/O button, add more memory configs.

---
 menu.cpp    | 12 ++++++++----
 user_io.cpp | 15 +++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/menu.cpp b/menu.cpp
index bcf0764..b72401b 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", "56M" };
+const char *config_memory_fast_msg[] = { "none", "2M",   "4M",   "25M", "58M", "293M", "327M" };
 
 const char *config_scanlines_msg[] = { "off", "dim", "black" };
 const char *config_ar_msg[] = { "4:3", "16:9" };
@@ -3473,7 +3473,10 @@ void HandleUI(void)
 		strcat(s, (minimig_config.memory & 0x40) ? "enabled " : "disabled");
 		OsdWrite(6, s, menusub == 4, 0);
 
-		for (int i = 7; i < OsdGetSize() - 1; i++) OsdWrite(i, "", 0, 0);
+		OsdWrite(7, "", 0, 0);
+		OsdWrite(8, ((minimig_config.memory & 0x80) && !(minimig_config.memory & 0x10)) ? "  ** 64MB SDRAM REQUIRED **" : "", 0, 0);
+
+		for (int i = 9; i < OsdGetSize() - 1; i++) OsdWrite(i, "", 0, 0);
 		OsdWrite(OsdGetSize() - 1, STD_EXIT, menusub == 5, 0);
 
 		menustate = MENU_SETTINGS_MEMORY2;
@@ -3489,8 +3492,9 @@ void HandleUI(void)
 			}
 			else if (menusub == 1)
 			{
-				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);
+				uint8_t c = (((minimig_config.memory >> 4) & 0x03) | ((minimig_config.memory & 0x80) >> 5))+1;
+				if (c > 6) c = 0;
+				minimig_config.memory = ((c<<4) & 0x30) | ((c<<5) & 0x80) | (minimig_config.memory & ~0xB0);
 				menustate = MENU_SETTINGS_MEMORY1;
 			}
 			else if (menusub == 2)
diff --git a/user_io.cpp b/user_io.cpp
index 73c5a12..56cf364 100644
--- a/user_io.cpp
+++ b/user_io.cpp
@@ -1558,14 +1558,17 @@ void user_io_send_buttons(char force)
 
 	if ((map != key_map) || force)
 	{
-		if (is_archie())
+		if (is_archie() && (key_map & BUTTON2) && !(map & BUTTON2))
 		{
-			if ((key_map & BUTTON2) && !(map & BUTTON2))
-			{
-				const char *name = get_rbf_name();
-				fpga_load_rbf(name[0] ? name : "Archie.rbf");
-			}
+			const char *name = get_rbf_name();
+			fpga_load_rbf(name[0] ? name : "Archie.rbf");
 		}
+
+		if (is_minimig() && (key_map & BUTTON2) && !(map & BUTTON2))
+		{
+			minimig_reset();
+		}
+
 		key_map = map;
 		spi_uio_cmd16(UIO_BUT_SW, map);
 		printf("sending keymap: %X\n", map);