From: Toni Wilen <twilen@winuae.net>
Date: Sun, 16 Sep 2018 17:20:45 +0000 (+0300)
Subject: Moved x86 bridgeboard expansions under new category.
X-Git-Tag: 4100~76
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=00c8cca626798cb2d4057840463cae2b0efbba3b;p=francis%2Fwinuae.git

Moved x86 bridgeboard expansions under new category.
---

diff --git a/expansion.cpp b/expansion.cpp
index ef895bb6..f07bbd19 100644
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -5314,24 +5314,24 @@ const struct expansionromtype expansionroms[] = {
 		NULL, NULL, NULL, NULL, ROMTYPE_AMAX | ROMTYPE_NONE, 0, 0, 0, false
 	},
 	{
-		_T("x86athdprimary"), _T("AT IDE Primary"), _T("x86"),
+		_T("x86athdprimary"), _T("AT IDE Primary"), NULL,
 		NULL, x86_at_hd_init_1, NULL, x86_add_at_hd_unit_1, ROMTYPE_X86_AT_HD1 | ROMTYPE_NOT, 0, 0, BOARD_NONAUTOCONFIG_AFTER_Z2, true,
 		NULL, 0,
-		false, EXPANSIONTYPE_IDE
+		false, EXPANSIONTYPE_X86_EXPANSION
 	},
 	{
-		_T("x86athdxt"), _T("XTIDE Universal BIOS HD"), _T("x86"),
+		_T("x86athdxt"), _T("XTIDE Universal BIOS HD"), NULL,
 		NULL, x86_at_hd_init_xt, NULL, x86_add_at_hd_unit_xt, ROMTYPE_X86_XT_IDE | ROMTYPE_NONE, 0, 0, BOARD_NONAUTOCONFIG_AFTER_Z2, true,
 		NULL, 0,
-		false, EXPANSIONTYPE_IDE,
+		false, EXPANSIONTYPE_X86_EXPANSION,
 		0, 0, 0, false, NULL,
 		false, 0, x86_athdxt_settings
 	},
 	{
-		_T("x86rt1000"), _T("Rancho RT1000"), _T("x86"),
+		_T("x86rt1000"), _T("Rancho RT1000"), NULL,
 		NULL, x86_rt1000_init, NULL, x86_rt1000_add_unit, ROMTYPE_X86_RT1000 | ROMTYPE_NONE, 0, 0, BOARD_NONAUTOCONFIG_AFTER_Z2, true,
 		NULL, 0,
-		false, EXPANSIONTYPE_SCSI,
+		false, EXPANSIONTYPE_X86_EXPANSION,
 		0, 0, 0, false, NULL,
 		false, 0, x86_rt1000_settings
 
@@ -5388,10 +5388,10 @@ const struct expansionromtype expansionroms[] = {
 		false, EXPANSIONTYPE_RTG
 	},
 	{
-		_T("x86vga"), _T("x86 VGA"), _T("x86"),
+		_T("x86vga"), _T("x86 VGA"), NULL,
 		NULL, NULL, NULL, NULL, ROMTYPE_x86_VGA | ROMTYPE_NONE, 0, 0, BOARD_IGNORE, true,
 		NULL, 0,
-		false, EXPANSIONTYPE_RTG,
+		false, EXPANSIONTYPE_X86_EXPANSION,
 		0, 0, 0, false, NULL,
 		false, 0, x86vga_settings
 	},
@@ -5658,7 +5658,7 @@ const struct expansionromtype expansionroms[] = {
 		_T("x86_mouse"), _T("x86 Bridgeboard mouse"), NULL,
 		NULL, isa_expansion_init, NULL, NULL, ROMTYPE_X86MOUSE | ROMTYPE_NOT, 0, 0, BOARD_NONAUTOCONFIG_BEFORE, true,
 		NULL, 0,
-		false, EXPANSIONTYPE_CUSTOM,
+		false, EXPANSIONTYPE_X86_EXPANSION,
 		0, 0, 0, false, NULL,
 		false, 0, x86_mouse_settings
 	},
diff --git a/include/autoconf.h b/include/autoconf.h
index 2e820f26..3cd334bd 100644
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -188,6 +188,7 @@ typedef void(*DEVICE_MEMORY_CALLBACK)(struct romconfig*, uae_u8*, int);
 #define EXPANSIONTYPE_INTERNAL 0x4000
 #define EXPANSIONTYPE_FALLBACK_DISABLE 0x8000
 #define EXPANSIONTYPE_HAS_FALLBACK 0x10000
+#define EXPANSIONTYPE_X86_EXPANSION 0x20000
 
 #define EXPANSIONBOARD_CHECKBOX 0
 #define EXPANSIONBOARD_MULTI 1
diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 125dffa1..b515827f 100644
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -2159,7 +2159,7 @@ BEGIN
                             "PPC native OS booted with incompatible UAE boot ROM enabled.\nSelect ROM panel ""New UAE (128k, ROM, Indirect)"" option\nor disable all UAE expansions.\n"
     IDS_AUTOSCALE_OVERSCAN_BLANK "Overscan blanking"
     IDS_NUMSG_NOMEMORY      "Out of memory or too much Z3 autoconfig space configured.\nIf 64-bit, make sure RTG board is first in board list."
-    IDS_EXPANSION_CATEGORY  "Built-in expansions\nSCSI controllers\nIDE controllers\nSASI controllers\nCustom controllers\nPCI bridgeboards\nx86 bridgeboards\nGraphics boards\nSound cards\nNetwork adapters\nDisk controllers"
+    IDS_EXPANSION_CATEGORY  "Built-in expansions\nSCSI controllers\nIDE controllers\nSASI controllers\nCustom controllers\nPCI bridgeboards\nx86 bridgeboards\nGraphics boards\nSound cards\nNetwork adapters\nDisk controllers\nx86 bridgeboard expansions"
     IDS_WINUAETITLE_PAUSED  "[Paused]"
     IDS_MOUSE_UNTRAP_MODE   "None (Alt-Tab)\nMiddle button\nMagic mouse\nBoth\n"
     IDS_TABLET_MODE         "-\nTablet emulation\n"
diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index b2abf9ad..95999af2 100644
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -9690,7 +9690,7 @@ struct netdriverdata **target_ethernet_enumerate(void)
 static const int scsiromselectedmask[] = {
 	EXPANSIONTYPE_INTERNAL, EXPANSIONTYPE_SCSI, EXPANSIONTYPE_IDE, EXPANSIONTYPE_SASI, EXPANSIONTYPE_CUSTOM,
 	EXPANSIONTYPE_PCI_BRIDGE, EXPANSIONTYPE_X86_BRIDGE, EXPANSIONTYPE_RTG,
-	EXPANSIONTYPE_SOUND, EXPANSIONTYPE_NET, EXPANSIONTYPE_FLOPPY
+	EXPANSIONTYPE_SOUND, EXPANSIONTYPE_NET, EXPANSIONTYPE_FLOPPY, EXPANSIONTYPE_X86_EXPANSION
 };
 static void init_expansion2(HWND hDlg, bool init)
 {