From 974ebd5d91d1738fb7d00f9a04762abac10dc7ae Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Mon, 6 Oct 2003 21:00:48 +0000
Subject: [PATCH] - Add checks against ROM patches space - Make sure to also
 load the floppy disk driver with Gossamer ROMs so   that exfs feature can
 work too

---
 SheepShaver/src/rom_patches.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/SheepShaver/src/rom_patches.cpp b/SheepShaver/src/rom_patches.cpp
index 2b6c5a10..4324eedf 100644
--- a/SheepShaver/src/rom_patches.cpp
+++ b/SheepShaver/src/rom_patches.cpp
@@ -725,6 +725,17 @@ bool PatchROM(void)
 	else
 		return false;
 
+	// Check that other ROM addresses point to really free regions
+	printf("%08x\n", ntohl(*(uint32 *)(ROM_BASE + CHECK_LOAD_PATCH_SPACE)));
+	if (ntohl(*(uint32 *)(ROM_BASE + CHECK_LOAD_PATCH_SPACE)) != 0x6b636b63)
+		return false;
+	if (ntohl(*(uint32 *)(ROM_BASE + PUT_SCRAP_PATCH_SPACE)) != 0x6b636b63)
+		return false;
+	if (ntohl(*(uint32 *)(ROM_BASE + GET_SCRAP_PATCH_SPACE)) != 0x6b636b63)
+		return false;
+	if (ntohl(*(uint32 *)(ROM_BASE + ADDR_MAP_PATCH_SPACE)) != 0x6b636b63)
+		return false;
+
 	// Apply patches
 	if (!patch_nanokernel_boot()) return false;
 	if (!patch_68k_emul()) return false;
@@ -2230,9 +2241,9 @@ void InstallDrivers(void)
 	uint8 pb[SIZEOF_IOParam];
 
 	// Install floppy driver
-	if (ROMType == ROMTYPE_NEWWORLD) {
+	if (ROMType == ROMTYPE_NEWWORLD || ROMType == ROMTYPE_GOSSAMER) {
 
-		// Force installation of floppy driver with NewWorld ROMs
+		// Force installation of floppy driver with NewWorld and Gossamer ROMs
 		r.a[0] = ROM_BASE + sony_offset;
 		r.d[0] = (uint32)SonyRefNum;
 		Execute68kTrap(0xa43d, &r);		// DrvrInstallRsrvMem()