From: Toni Wilen <twilen@winuae.net>
Date: Mon, 21 Dec 2020 19:25:10 +0000 (+0200)
Subject: GFORCE 040
X-Git-Tag: 4900~233
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=65fa774adb95d718d0b4c07e940764655289671e;p=francis%2Fwinuae.git

GFORCE 040
---

diff --git a/a2091.cpp b/a2091.cpp
index ce00be81..4d06121b 100644
--- a/a2091.cpp
+++ b/a2091.cpp
@@ -4412,6 +4412,8 @@ static bool gvp_init(struct autoconfig_info *aci, bool series2, bool accel)
 			wd->gdmac.version = isscsi ? GVP_A530_SCSI : GVP_A530;
 		} else if (ISCPUBOARD(BOARD_GVP, BOARD_GVP_SUB_GFORCE030)) {
 			wd->gdmac.version = isscsi ? GVP_GFORCE_030_SCSI : GVP_GFORCE_030;
+		} else if (ISCPUBOARD(BOARD_GVP, BOARD_GVP_SUB_GFORCE040)) {
+			wd->gdmac.version = isscsi ? GVP_GFORCE_040_SCSI : GVP_GFORCE_040;
 		} else if (ISCPUBOARD(BOARD_GVP, BOARD_GVP_SUB_A1230SII)) {
 			wd->gdmac.version = (currprefs.cpuboard_settings & 2) ? GVP_A1291 : GVP_A1291_SCSI;
 			wd->wc.resetnodelay = true;
diff --git a/cpuboard.cpp b/cpuboard.cpp
index 90048d1c..90dee071 100644
--- a/cpuboard.cpp
+++ b/cpuboard.cpp
@@ -1012,7 +1012,8 @@ static const uae_u32 gvp_a530_maprom[7] =
 void cpuboard_gvpmaprom(int b)
 {
 	if (!ISCPUBOARDP(&currprefs, BOARD_GVP, BOARD_GVP_SUB_A530) &&
-		!ISCPUBOARDP(&currprefs, BOARD_GVP, BOARD_GVP_SUB_GFORCE030))
+		!ISCPUBOARDP(&currprefs, BOARD_GVP, BOARD_GVP_SUB_GFORCE030) && 
+		!ISCPUBOARDP(&currprefs, BOARD_GVP, BOARD_GVP_SUB_GFORCE040))
 		return;
 
 	write_log(_T("GVP MAPROM=%d\n"), b);
@@ -2606,6 +2607,7 @@ bool cpuboard_autoconfig_init(struct autoconfig_info *aci)
 			case BOARD_GVP_SUB_A530:
 			case BOARD_GVP_SUB_A1230SII:
 			case BOARD_GVP_SUB_GFORCE030:
+			case BOARD_GVP_SUB_GFORCE040:
 				aci->addrbank = &expamem_null;
 				return true;
 			case BOARD_GVP_SUB_A3001SI:
diff --git a/expansion.cpp b/expansion.cpp
index b9b52fbc..3b878352 100644
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -6153,6 +6153,16 @@ static const struct cpuboardsubtype gvpboard_sub[] = {
 		0,
 		gvp_init_accelerator, NULL, BOARD_AUTOCONFIG_Z2, 1
 	},
+	{
+		_T("G-Force 040"),
+		_T("GVPGFORCE040"),
+		ROMTYPE_GVPS2, ROMTYPE_GVPS12, 4,
+		gvp_s2_add_accelerator_scsi_unit, EXPANSIONTYPE_SCSI,
+		BOARD_MEMORY_25BITMEM,
+		128 * 1024 * 1024,
+		0,
+		gvp_init_accelerator, NULL, BOARD_AUTOCONFIG_Z2, 1
+	},
 	{
 		_T("Tek Magic 2040/2060"),
 		_T("TekMagic"),
diff --git a/include/cpuboard.h b/include/cpuboard.h
index 92f6b666..20da0bf5 100644
--- a/include/cpuboard.h
+++ b/include/cpuboard.h
@@ -67,10 +67,11 @@ void cpuboard_gvpmaprom(int);
 #define BOARD_GVP_SUB_A3001SII 1
 #define BOARD_GVP_SUB_A530 2
 #define BOARD_GVP_SUB_GFORCE030 3
-#define BOARD_GVP_SUB_TEKMAGIC 4
-#define BOARD_GVP_SUB_A1230SI 5
-#define BOARD_GVP_SUB_A1230SII 6
-#define BOARD_GVP_SUB_QUIKPAK 7
+#define BOARD_GVP_SUB_GFORCE040 4
+#define BOARD_GVP_SUB_TEKMAGIC 5
+#define BOARD_GVP_SUB_A1230SI 6
+#define BOARD_GVP_SUB_A1230SII 7
+#define BOARD_GVP_SUB_QUIKPAK 8
 
 #define BOARD_KUPKE 6