From: Toni Wilen <twilen@winuae.net>
Date: Tue, 1 Aug 2017 19:07:15 +0000 (+0300)
Subject: InMate jumpers.
X-Git-Tag: 3600~139
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=ac3a8f3232bf2fbe897c2e9888e00b0b6c47098d;p=francis%2Fwinuae.git

InMate jumpers.
---

diff --git a/expansion.cpp b/expansion.cpp
index a6f9e456..4f4cbed2 100644
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -4318,6 +4318,33 @@ static void nexus_memory_callback(struct romconfig *rc, uae_u8 *ac, int size)
 	else
 		ac[1] = 8;
 }
+static const struct expansionboardsettings inmate_settings[] = {
+	{
+		_T("M0"), _T("m0")
+	},
+	{
+		_T("M1"), _T("m1")
+	},
+	{
+		_T("AMEM"), _T("amem")
+	},
+	{
+		_T("BTIME"), _T("btime")
+	},
+	{
+		_T("ABOOT"), _T("aboot")
+	},
+	{
+		_T("FPU"), _T("fpu")
+	},
+	{
+		_T("MAP 4/8"), _T("map48")
+	},
+	{
+		NULL
+	}
+};
+
 static const struct expansionboardsettings golemfast_settings[] = {
 	{
 		_T("IDE"),
@@ -4804,7 +4831,9 @@ const struct expansionromtype expansionroms[] = {
 		_T("inmate"), _T("InMate"), _T("Spirit Technology"),
 		NULL, inmate_init, NULL, inmate_add_scsi_unit, ROMTYPE_INMATE | ROMTYPE_NONE, 0, 0, BOARD_AUTOCONFIG_Z2, false,
 		NULL, 0,
-		true, EXPANSIONTYPE_SCSI
+		true, EXPANSIONTYPE_SCSI,
+		0, 0, 0, false, NULL,
+		false, 0, inmate_settings
 	},
 	{
 		_T("supradrive"), _T("SupraDrive"), _T("Supra Corporation"),
diff --git a/scsi.cpp b/scsi.cpp
index 2b7dbc27..d8d29d96 100644
--- a/scsi.cpp
+++ b/scsi.cpp
@@ -2686,7 +2686,9 @@ static uae_u32 ncr80_bget2(struct soft_scsi *ncr, uaecptr addr, int size)
 			} else if (addr == 0x82) {
 				v = aic_bget_data(ncr);
 			} else if (addr == 0x84) {
-				v = (1 << 5) | (1 << 4) | (1 << 3);
+				v = ncr->rc->device_settings & 0x7f;
+				if (!ncr->rc->autoboot_disabled)
+					v |= 1 << 4;
 				if (ncr->dma_direction)
 					v |= 1 << 7;
 			} else if (addr == 0x88 || addr == 0x89) {