From: kub <derkub@gmail.com>
Date: Wed, 1 Nov 2023 21:35:37 +0000 (+0100)
Subject: Merge pull request #96 from 'techmetx11/master'
X-Git-Tag: v2.00~172
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5038e421e994371969cd10bf92ceda684ae4c014;p=picodrive.git

Merge pull request #96 from 'techmetx11/master'

* techmetx11/master:
  Add hack for unlicensed games that don't handle the Z80 bus properly
---

5038e421e994371969cd10bf92ceda684ae4c014
diff --cc pico/memory.c
index 818080fd,6ee6282b..cf2db5ba
--- a/pico/memory.c
+++ b/pico/memory.c
@@@ -675,7 -675,7 +675,7 @@@ static void PicoWrite16_sram(u32 a, u3
  static u32 PicoRead8_z80(u32 a)
  {
    u32 d = 0xff;
-   if ((Pico.m.z80Run & 1) || Pico.m.z80_reset) {
 -  if (!(PicoIn.quirks & PQUIRK_NO_Z80_BUS_LOCK) && ((Pico.m.z80Run & 1) || Pico.m.z80_reset)) {
++  if (((Pico.m.z80Run & 1) || Pico.m.z80_reset) && !(PicoIn.quirks & PQUIRK_NO_Z80_BUS_LOCK)) {
      elprintf(EL_ANOMALY, "68k z80 read with no bus! [%06x] @ %06x", a, SekPc);
      // open bus. Pulled down if MegaCD2 is attached.
      return 0;
@@@ -699,7 -699,7 +699,7 @@@ static u32 PicoRead16_z80(u32 a
  
  static void PicoWrite8_z80(u32 a, u32 d)
  {
-   if ((Pico.m.z80Run & 1) || Pico.m.z80_reset) {
 -  if (!(PicoIn.quirks & PQUIRK_NO_Z80_BUS_LOCK) && ((Pico.m.z80Run & 1) || Pico.m.z80_reset)) {
++  if (((Pico.m.z80Run & 1) || Pico.m.z80_reset) && !(PicoIn.quirks & PQUIRK_NO_Z80_BUS_LOCK)) {
      // verified on real hw
      elprintf(EL_ANOMALY, "68k z80 write with no bus or reset! [%06x] %02x @ %06x", a, d&0xff, SekPc);
      return;