From: Toni Wilen Date: Wed, 24 Aug 2016 16:11:14 +0000 (+0300) Subject: Prevent PPC direct mapping. (Previous update made these JIT compatible) X-Git-Tag: 3400~118 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=89688a9cf04737d04d2c2b9e61c3a40c04654004;p=francis%2Fwinuae.git Prevent PPC direct mapping. (Previous update made these JIT compatible) --- diff --git a/a2065.cpp b/a2065.cpp index 0ff4f941..7efcb911 100644 --- a/a2065.cpp +++ b/a2065.cpp @@ -831,7 +831,7 @@ static addrbank a2065_bank = { a2065_lput, a2065_wput, a2065_bput, a2065_xlate, a2065_check, NULL, _T("*"), _T("A2065 Z2 Ethernet"), a2065_lgeti, a2065_wgeti, - ABFLAG_IO, S_READ, S_WRITE + ABFLAG_IO | ABFLAG_PPCIOSPACE, S_READ, S_WRITE }; static void REGPARAM2 a2065_bput (uaecptr addr, uae_u32 b) diff --git a/a2091.cpp b/a2091.cpp index f7f61272..ac5131a7 100644 --- a/a2091.cpp +++ b/a2091.cpp @@ -2449,7 +2449,7 @@ static const addrbank dmaca2091_bank = { dmac_a2091_lput, dmac_a2091_wput, dmac_a2091_bput, dmac_a2091_xlate, dmac_a2091_check, NULL, _T("*"), _T("A2090/A2091/A590"), dmac_a2091_lgeti, dmac_a2091_wgeti, - ABFLAG_IO | ABFLAG_SAFE, S_READ, S_WRITE + ABFLAG_IO | ABFLAG_SAFE | ABFLAG_PPCIOSPACE, S_READ, S_WRITE }; @@ -2949,7 +2949,7 @@ static const addrbank gvp_bank = { dmac_gvp_lput, dmac_gvp_wput, dmac_gvp_bput, dmac_gvp_xlate, dmac_gvp_check, NULL, NULL, _T("GVP"), dmac_gvp_lgeti, dmac_gvp_wgeti, - ABFLAG_IO | ABFLAG_SAFE, S_READ, S_WRITE + ABFLAG_IO | ABFLAG_SAFE | ABFLAG_PPCIOSPACE, S_READ, S_WRITE }; /* SUPERDMAC (A3000 mainboard built-in) */ @@ -3298,6 +3298,7 @@ bool a3000scsi_init(struct autoconfig_info *aci) aci->addrbank = &expamem_nonautoconfig; aci->start = 0xdd0000; aci->size = 0x10000; + aci->hardwired = true; if (!aci->doinit) { return true; }