From 40e2d3d84b4179b9ce2ffbac8a0201a519e6047c Mon Sep 17 00:00:00 2001 From: Seth Polsley Date: Thu, 10 Sep 2020 17:31:21 -0500 Subject: [PATCH] Removing temp ignoresegv patch --- SheepShaver/src/include/rom_patches.h | 1 - SheepShaver/src/rom_patches.cpp | 3 --- SheepShaver/src/rsrc_patches.cpp | 1 - 3 files changed, 5 deletions(-) diff --git a/SheepShaver/src/include/rom_patches.h b/SheepShaver/src/include/rom_patches.h index a4b4e283..c263606a 100644 --- a/SheepShaver/src/include/rom_patches.h +++ b/SheepShaver/src/include/rom_patches.h @@ -31,7 +31,6 @@ enum { ROMTYPE_NEWWORLD }; extern int ROMType; -extern bool SoundPatchFlag; extern bool DecodeROM(uint8 *data, uint32 size); extern bool PatchROM(void); diff --git a/SheepShaver/src/rom_patches.cpp b/SheepShaver/src/rom_patches.cpp index 804d6a97..b9ccc986 100644 --- a/SheepShaver/src/rom_patches.cpp +++ b/SheepShaver/src/rom_patches.cpp @@ -67,7 +67,6 @@ const uint32 ADDR_MAP_PATCH_SPACE = 0x2fd140; // Global variables int ROMType; // ROM type -bool SoundPatchFlag; static uint32 sony_offset; // Offset of .Sony driver resource // Prototypes @@ -694,8 +693,6 @@ bool PatchROM(void) ROMType = ROMTYPE_NEWWORLD; else return false; - - SoundPatchFlag = ROMType == ROMTYPE_NEWWORLD && !PrefsFindBool("ignoresegv"); // Check that other ROM addresses point to really free regions if (!check_rom_patch_space(CHECK_LOAD_PATCH_SPACE, 0x40)) diff --git a/SheepShaver/src/rsrc_patches.cpp b/SheepShaver/src/rsrc_patches.cpp index 06ab27b8..344b1bad 100644 --- a/SheepShaver/src/rsrc_patches.cpp +++ b/SheepShaver/src/rsrc_patches.cpp @@ -522,7 +522,6 @@ void CheckLoad(uint32 type, int16 id, uint16 *p, uint32 size) // Install sound input driver memcpy(p, sound_input_driver, sizeof(sound_input_driver)); D(bug(" patch 1 applied\n")); -*/ } else if (type == FOURCC('I','N','I','T') && id == 1 && size == (2416 >> 1)) { D(bug("INIT 1 (size 2416) found\n")); size >>= 1;