From b33ea8f0ac8bf5ed4070d6a9cff57fe9744be562 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Thu, 19 Jan 2023 18:22:48 -0500
Subject: [PATCH] apply new hard reset strategy on all OPN chips

---
 src/engine/platform/fmsharedbase.h |  4 +-
 src/engine/platform/genesis.cpp    |  3 +-
 src/engine/platform/ym2203.cpp     | 62 ++++++++++++++----------
 src/engine/platform/ym2608.cpp     | 76 ++++++++++++++++++++----------
 src/engine/platform/ym2610.cpp     | 72 ++++++++++++++++++----------
 src/engine/platform/ym2610b.cpp    | 70 ++++++++++++++++++---------
 6 files changed, 187 insertions(+), 100 deletions(-)

diff --git a/src/engine/platform/fmsharedbase.h b/src/engine/platform/fmsharedbase.h
index 90548aab..9e89ddc2 100644
--- a/src/engine/platform/fmsharedbase.h
+++ b/src/engine/platform/fmsharedbase.h
@@ -47,6 +47,8 @@ class DivPlatformFMBase: public DivDispatch {
       0,2,1,3
     };
 
+    const unsigned int hardResetCycles=127;
+
     struct FMChannel: public SharedChannel<int> {
       DivInstrumentFM state;
       unsigned char freqH, freqL;
@@ -83,7 +85,6 @@ class DivPlatformFMBase: public DivDispatch {
 
     unsigned char lastBusy;
     int delay;
-    unsigned int hardResetCycles;
     bool flushFirst;
 
     unsigned char regPool[512];
@@ -124,7 +125,6 @@ class DivPlatformFMBase: public DivDispatch {
       DivDispatch(),
       lastBusy(0),
       delay(0),
-      hardResetCycles(0),
       flushFirst(false) {}
 };
 
diff --git a/src/engine/platform/genesis.cpp b/src/engine/platform/genesis.cpp
index 1a9573cc..a73e42c9 100644
--- a/src/engine/platform/genesis.cpp
+++ b/src/engine/platform/genesis.cpp
@@ -549,6 +549,7 @@ void DivPlatformGenesis::tick(bool sysTick) {
       immWrite(0xf0,i&0xff);
     }
     for (int i=0; i<csmChan; i++) {
+      if (i==2 && extMode) continue;
       if ((chan[i].keyOn || chan[i].opMaskChanged) && chan[i].hardReset) {
         if (i<6) {
           immWrite(0x28,(chan[i].opMask<<4)|konOffs[i]);
@@ -1320,8 +1321,6 @@ void DivPlatformGenesis::setFlags(const DivConfig& flags) {
   } else {
     rate=chipClock/36;
   }
-  // 2ms
-  hardResetCycles=(chipClock/144)/500;
   for (int i=0; i<10; i++) {
     oscBuf[i]->rate=rate;
   }
diff --git a/src/engine/platform/ym2203.cpp b/src/engine/platform/ym2203.cpp
index c2a547d8..e161ac04 100644
--- a/src/engine/platform/ym2203.cpp
+++ b/src/engine/platform/ym2203.cpp
@@ -411,29 +411,6 @@ void DivPlatformYM2203::tick(bool sysTick) {
         rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
       }
     }
-
-    if (chan[i].keyOn || chan[i].keyOff) {
-      if (chan[i].hardReset && chan[i].keyOn) {
-        for (int j=0; j<4; j++) {
-          unsigned short baseAddr=chanOffs[i]|opOffs[j];
-          immWrite(baseAddr+ADDR_SL_RR,0x0f);
-          immWrite(baseAddr+ADDR_TL,0x7f);
-          oldWrites[baseAddr+ADDR_SL_RR]=-1;
-          oldWrites[baseAddr+ADDR_TL]=-1;
-          //rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
-        }
-      }
-      immWrite(0x28,0x00|konOffs[i]);
-      if (chan[i].hardReset && chan[i].keyOn) {
-        for (int j=0; j<4; j++) {
-          unsigned short baseAddr=chanOffs[i]|opOffs[j];
-          for (int k=0; k<100; k++) {
-            immWrite(baseAddr+ADDR_SL_RR,0x0f);
-          }
-        }
-      }
-      chan[i].keyOff=false;
-    }
   }
 
   for (int i=16; i<256; i++) {
@@ -443,6 +420,26 @@ void DivPlatformYM2203::tick(bool sysTick) {
     }
   }
 
+  int hardResetElapsed=0;
+  bool mustHardReset=false;
+
+  for (int i=0; i<3; i++) {
+    if (i==2 && extMode) continue;
+    if (chan[i].keyOn || chan[i].keyOff) {
+      immWrite(0x28,0x00|konOffs[i]);
+      if (chan[i].hardReset && chan[i].keyOn) {
+        mustHardReset=true;
+        for (int j=0; j<4; j++) {
+          unsigned short baseAddr=chanOffs[i]|opOffs[j];
+          oldWrites[baseAddr+ADDR_SL_RR]=-1;
+          immWrite(baseAddr+ADDR_SL_RR,0x0f);
+          hardResetElapsed++;
+        }
+      }
+      chan[i].keyOff=false;
+    }
+  }
+
   for (int i=0; i<3; i++) {
     if (i==2 && extMode) continue;
     if (chan[i].freqChanged) {
@@ -464,14 +461,31 @@ void DivPlatformYM2203::tick(bool sysTick) {
       if (chan[i].freq>0x3fff) chan[i].freq=0x3fff;
       immWrite(chanOffs[i]+ADDR_FREQH,chan[i].freq>>8);
       immWrite(chanOffs[i]+ADDR_FREQ,chan[i].freq&0xff);
+      hardResetElapsed+=2;
       chan[i].freqChanged=false;
     }
-    if (chan[i].keyOn || chan[i].opMaskChanged) {
+    if ((chan[i].keyOn || chan[i].opMaskChanged) && !chan[i].hardReset) {
       immWrite(0x28,(chan[i].opMask<<4)|konOffs[i]);
+      hardResetElapsed++;
       chan[i].opMaskChanged=false;
       chan[i].keyOn=false;
     }
   }
+
+  // hard reset handling
+  if (mustHardReset) {
+    for (unsigned int i=hardResetElapsed; i<hardResetCycles; i++) {
+      immWrite(0xf0,i&0xff);
+    }
+    for (int i=0; i<3; i++) {
+      if (i==2 && extMode) continue;
+      if ((chan[i].keyOn || chan[i].opMaskChanged) && chan[i].hardReset) {
+        immWrite(0x28,(chan[i].opMask<<4)|konOffs[i]);
+        chan[i].opMaskChanged=false;
+        chan[i].keyOn=false;
+      }
+    }
+  }
 }
 
 void DivPlatformYM2203::commitState(int ch, DivInstrument* ins) {
diff --git a/src/engine/platform/ym2608.cpp b/src/engine/platform/ym2608.cpp
index 063b3870..8b8a15ca 100644
--- a/src/engine/platform/ym2608.cpp
+++ b/src/engine/platform/ym2608.cpp
@@ -606,29 +606,6 @@ void DivPlatformYM2608::tick(bool sysTick) {
         rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
       }
     }
-
-    if (chan[i].keyOn || chan[i].keyOff) {
-      if (chan[i].hardReset && chan[i].keyOn) {
-        for (int j=0; j<4; j++) {
-          unsigned short baseAddr=chanOffs[i]|opOffs[j];
-          immWrite(baseAddr+ADDR_SL_RR,0x0f);
-          immWrite(baseAddr+ADDR_TL,0x7f);
-          oldWrites[baseAddr+ADDR_SL_RR]=-1;
-          oldWrites[baseAddr+ADDR_TL]=-1;
-          //rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
-        }
-      }
-      immWrite(0x28,0x00|konOffs[i]);
-      if (chan[i].hardReset && chan[i].keyOn) {
-        for (int j=0; j<4; j++) {
-          unsigned short baseAddr=chanOffs[i]|opOffs[j];
-          for (int k=0; k<100; k++) {
-            immWrite(baseAddr+ADDR_SL_RR,0x0f);
-          }
-        }
-      }
-      chan[i].keyOff=false;
-    }
   }
 
   for (int i=16; i<512; i++) {
@@ -638,6 +615,26 @@ void DivPlatformYM2608::tick(bool sysTick) {
     }
   }
 
+  int hardResetElapsed=0;
+  bool mustHardReset=false;
+
+  for (int i=0; i<6; i++) {
+    if (i==2 && extMode) continue;
+    if (chan[i].keyOn || chan[i].keyOff) {
+      immWrite(0x28,0x00|konOffs[i]);
+      if (chan[i].hardReset && chan[i].keyOn) {
+        mustHardReset=true;
+        for (int j=0; j<4; j++) {
+          unsigned short baseAddr=chanOffs[i]|opOffs[j];
+          oldWrites[baseAddr+ADDR_SL_RR]=-1;
+          immWrite(baseAddr+ADDR_SL_RR,0x0f);
+          hardResetElapsed++;
+        }
+      }
+      chan[i].keyOff=false;
+    }
+  }
+
   for (int i=0; i<6; i++) {
     if (i==2 && extMode) continue;
     if (chan[i].freqChanged) {
@@ -659,10 +656,12 @@ void DivPlatformYM2608::tick(bool sysTick) {
       if (chan[i].freq>0x3fff) chan[i].freq=0x3fff;
       immWrite(chanOffs[i]+ADDR_FREQH,chan[i].freq>>8);
       immWrite(chanOffs[i]+ADDR_FREQ,chan[i].freq&0xff);
+      hardResetElapsed+=2;
       chan[i].freqChanged=false;
     }
-    if (chan[i].keyOn || chan[i].opMaskChanged) {
+    if ((chan[i].keyOn || chan[i].opMaskChanged) && !chan[i].hardReset) {
       immWrite(0x28,(chan[i].opMask<<4)|konOffs[i]);
+      hardResetElapsed++;
       chan[i].opMaskChanged=false;
       chan[i].keyOn=false;
     }
@@ -679,6 +678,7 @@ void DivPlatformYM2608::tick(bool sysTick) {
         if (globalRSSVolume!=(chan[i].std.duty.val&0x3f)) {
           globalRSSVolume=chan[i].std.duty.val&0x3f;
           immWrite(0x11,globalRSSVolume);
+          hardResetElapsed++;
         }
       }
       if (chan[i].std.panL.had) {
@@ -691,6 +691,7 @@ void DivPlatformYM2608::tick(bool sysTick) {
       }
       if (!isMuted[i] && (chan[i].std.vol.had || chan[i].std.panL.had)) {
         immWrite(0x18+(i-9),isMuted[i]?0:((chan[i].pan<<6)|chan[i].outVol));
+        hardResetElapsed++;
       }
     }
     if (chan[i].keyOff) {
@@ -709,6 +710,7 @@ void DivPlatformYM2608::tick(bool sysTick) {
     if (chan[15].std.vol.had) {
       chan[15].outVol=(chan[15].vol*MIN(chan[15].macroVolMul,chan[15].std.vol.val))/chan[15].macroVolMul;
       immWrite(0x10b,chan[15].outVol);
+      hardResetElapsed++;
     }
 
     if (NEW_ARP_STRAT) {
@@ -735,6 +737,7 @@ void DivPlatformYM2608::tick(bool sysTick) {
         chan[15].pan=chan[15].std.panL.val&3;
         if (!isMuted[15]) {
           immWrite(0x101,(isMuted[15]?0:(chan[15].pan<<6))|2);
+          hardResetElapsed++;
         }
       }
     }
@@ -755,12 +758,17 @@ void DivPlatformYM2608::tick(bool sysTick) {
     }
     immWrite(0x109,chan[15].freq&0xff);
     immWrite(0x10a,(chan[15].freq>>8)&0xff);
+    hardResetElapsed+=2;
     if (chan[15].keyOn || chan[15].keyOff) {
-      if (chan[15].keyOff) immWrite(0x100,0x01); // reset
+      if (chan[15].keyOff) {
+        immWrite(0x100,0x01); // reset
+        hardResetElapsed++;
+      }
       if (chan[15].active && chan[15].keyOn && !chan[15].keyOff) {
         if (chan[15].sample>=0 && chan[15].sample<parent->song.sampleLen) {
           DivSample* s=parent->getSample(chan[15].sample);
           immWrite(0x100,(s->isLoopable())?0xb0:0xa0); // start/repeat
+          hardResetElapsed++;
         }
       }
       chan[15].keyOn=false;
@@ -771,11 +779,13 @@ void DivPlatformYM2608::tick(bool sysTick) {
 
   if (writeRSSOff) {
     immWrite(0x10,0x80|writeRSSOff);
+    hardResetElapsed++;
     writeRSSOff=0;
   }
 
   if (writeRSSOn) {
     immWrite(0x10,writeRSSOn);
+    hardResetElapsed++;
     writeRSSOn=0;
   }
 
@@ -785,8 +795,24 @@ void DivPlatformYM2608::tick(bool sysTick) {
   for (DivRegWrite& i: ay->getRegisterWrites()) {
     if (i.addr>15) continue;
     immWrite(i.addr&15,i.val);
+    hardResetElapsed++;
   }
   ay->getRegisterWrites().clear();
+
+  // hard reset handling
+  if (mustHardReset) {
+    for (unsigned int i=hardResetElapsed; i<hardResetCycles; i++) {
+      immWrite(0xf0,i&0xff);
+    }
+    for (int i=0; i<6; i++) {
+      if (i==2 && extMode) continue;
+      if ((chan[i].keyOn || chan[i].opMaskChanged) && chan[i].hardReset) {
+        immWrite(0x28,(chan[i].opMask<<4)|konOffs[i]);
+        chan[i].opMaskChanged=false;
+        chan[i].keyOn=false;
+      }
+    }
+  }
 }
 
 void DivPlatformYM2608::commitState(int ch, DivInstrument* ins) {
diff --git a/src/engine/platform/ym2610.cpp b/src/engine/platform/ym2610.cpp
index ba1c9440..c0f4a3fd 100644
--- a/src/engine/platform/ym2610.cpp
+++ b/src/engine/platform/ym2610.cpp
@@ -539,29 +539,6 @@ void DivPlatformYM2610::tick(bool sysTick) {
         rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
       }
     }
-
-    if (chan[i].keyOn || chan[i].keyOff) {
-      if (chan[i].hardReset && chan[i].keyOn) {
-        for (int j=0; j<4; j++) {
-          unsigned short baseAddr=chanOffs[i]|opOffs[j];
-          immWrite(baseAddr+ADDR_SL_RR,0x0f);
-          immWrite(baseAddr+ADDR_TL,0x7f);
-          oldWrites[baseAddr+ADDR_SL_RR]=-1;
-          oldWrites[baseAddr+ADDR_TL]=-1;
-          //rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
-        }
-      }
-      immWrite(0x28,0x00|konOffs[i]);
-      if (chan[i].hardReset && chan[i].keyOn) {
-        for (int j=0; j<4; j++) {
-          unsigned short baseAddr=chanOffs[i]|opOffs[j];
-          for (int k=0; k<100; k++) {
-            immWrite(baseAddr+ADDR_SL_RR,0x0f);
-          }
-        }
-      }
-      chan[i].keyOff=false;
-    }
   }
 
   for (int i=16; i<512; i++) {
@@ -571,6 +548,26 @@ void DivPlatformYM2610::tick(bool sysTick) {
     }
   }
 
+  int hardResetElapsed=0;
+  bool mustHardReset=false;
+
+  for (int i=0; i<psgChanOffs; i++) {
+    if (i==1 && extMode) continue;
+    if (chan[i].keyOn || chan[i].keyOff) {
+      immWrite(0x28,0x00|konOffs[i]);
+      if (chan[i].hardReset && chan[i].keyOn) {
+        mustHardReset=true;
+        for (int j=0; j<4; j++) {
+          unsigned short baseAddr=chanOffs[i]|opOffs[j];
+          oldWrites[baseAddr+ADDR_SL_RR]=-1;
+          immWrite(baseAddr+ADDR_SL_RR,0x0f);
+          hardResetElapsed++;
+        }
+      }
+      chan[i].keyOff=false;
+    }
+  }
+
   for (int i=0; i<psgChanOffs; i++) {
     if (i==1 && extMode) continue;
     if (chan[i].freqChanged) {
@@ -592,10 +589,12 @@ void DivPlatformYM2610::tick(bool sysTick) {
       if (chan[i].freq>0x3fff) chan[i].freq=0x3fff;
       immWrite(chanOffs[i]+ADDR_FREQH,chan[i].freq>>8);
       immWrite(chanOffs[i]+ADDR_FREQ,chan[i].freq&0xff);
+      hardResetElapsed+=2;
       chan[i].freqChanged=false;
     }
-    if (chan[i].keyOn || chan[i].opMaskChanged) {
+    if ((chan[i].keyOn || chan[i].opMaskChanged) && !chan[i].hardReset) {
       immWrite(0x28,(chan[i].opMask<<4)|konOffs[i]);
+      hardResetElapsed++;
       chan[i].opMaskChanged=false;
       chan[i].keyOn=false;
     }
@@ -612,6 +611,7 @@ void DivPlatformYM2610::tick(bool sysTick) {
         if (globalADPCMAVolume!=(chan[i].std.duty.val&0x3f)) {
           globalADPCMAVolume=chan[i].std.duty.val&0x3f;
           immWrite(0x101,globalADPCMAVolume);
+          hardResetElapsed++;
         }
       }
       if (chan[i].std.panL.had) {
@@ -624,6 +624,7 @@ void DivPlatformYM2610::tick(bool sysTick) {
       }
       if (!isMuted[i] && (chan[i].std.vol.had || chan[i].std.panL.had)) {
         immWrite(0x108+(i-adpcmAChanOffs),isMuted[i]?0:((chan[i].pan<<6)|chan[i].outVol));
+        hardResetElapsed++;
       }
     }
     if (chan[i].keyOff) {
@@ -644,6 +645,7 @@ void DivPlatformYM2610::tick(bool sysTick) {
     if (chan[adpcmBChanOffs].std.vol.had) {
       chan[adpcmBChanOffs].outVol=(chan[adpcmBChanOffs].vol*MIN(chan[adpcmBChanOffs].macroVolMul,chan[adpcmBChanOffs].std.vol.val))/chan[adpcmBChanOffs].macroVolMul;
       immWrite(0x1b,chan[adpcmBChanOffs].outVol);
+      hardResetElapsed++;
     }
 
     if (NEW_ARP_STRAT) {
@@ -670,6 +672,7 @@ void DivPlatformYM2610::tick(bool sysTick) {
         chan[adpcmBChanOffs].pan=chan[adpcmBChanOffs].std.panL.val&3;
         if (!isMuted[adpcmBChanOffs]) {
           immWrite(0x11,(isMuted[adpcmBChanOffs]?0:(chan[adpcmBChanOffs].pan<<6)));
+          hardResetElapsed++;
         }
       }
     }
@@ -689,13 +692,16 @@ void DivPlatformYM2610::tick(bool sysTick) {
       }
       immWrite(0x19,chan[adpcmBChanOffs].freq&0xff);
       immWrite(0x1a,(chan[adpcmBChanOffs].freq>>8)&0xff);
+      hardResetElapsed+=2;
     }
     if (chan[adpcmBChanOffs].keyOn || chan[adpcmBChanOffs].keyOff) {
       immWrite(0x10,0x01); // reset
+      hardResetElapsed++;
       if (chan[adpcmBChanOffs].active && chan[adpcmBChanOffs].keyOn && !chan[adpcmBChanOffs].keyOff) {
         if (chan[adpcmBChanOffs].sample>=0 && chan[adpcmBChanOffs].sample<parent->song.sampleLen) {
           DivSample* s=parent->getSample(chan[adpcmBChanOffs].sample);
           immWrite(0x10,(s->isLoopable())?0x90:0x80); // start/repeat
+          hardResetElapsed++;
         }
       }
       chan[adpcmBChanOffs].keyOn=false;
@@ -706,11 +712,13 @@ void DivPlatformYM2610::tick(bool sysTick) {
 
   if (writeADPCMAOff) {
     immWrite(0x100,0x80|writeADPCMAOff);
+    hardResetElapsed++;
     writeADPCMAOff=0;
   }
 
   if (writeADPCMAOn) {
     immWrite(0x100,writeADPCMAOn);
+    hardResetElapsed++;
     writeADPCMAOn=0;
   }
 
@@ -720,8 +728,24 @@ void DivPlatformYM2610::tick(bool sysTick) {
   for (DivRegWrite& i: ay->getRegisterWrites()) {
     if (i.addr>15) continue;
     immWrite(i.addr&15,i.val);
+    hardResetElapsed++;
   }
   ay->getRegisterWrites().clear();
+
+  // hard reset handling
+  if (mustHardReset) {
+    for (unsigned int i=hardResetElapsed; i<hardResetCycles; i++) {
+      immWrite(0xf0,i&0xff);
+    }
+    for (int i=0; i<psgChanOffs; i++) {
+      if (i==1 && extMode) continue;
+      if ((chan[i].keyOn || chan[i].opMaskChanged) && chan[i].hardReset) {
+        immWrite(0x28,(chan[i].opMask<<4)|konOffs[i]);
+        chan[i].opMaskChanged=false;
+        chan[i].keyOn=false;
+      }
+    }
+  }
 }
 
 void DivPlatformYM2610::commitState(int ch, DivInstrument* ins) {
diff --git a/src/engine/platform/ym2610b.cpp b/src/engine/platform/ym2610b.cpp
index 39285d65..67e44e36 100644
--- a/src/engine/platform/ym2610b.cpp
+++ b/src/engine/platform/ym2610b.cpp
@@ -606,29 +606,6 @@ void DivPlatformYM2610B::tick(bool sysTick) {
         rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
       }
     }
-
-    if (chan[i].keyOn || chan[i].keyOff) {
-      if (chan[i].hardReset && chan[i].keyOn) {
-        for (int j=0; j<4; j++) {
-          unsigned short baseAddr=chanOffs[i]|opOffs[j];
-          immWrite(baseAddr+ADDR_SL_RR,0x0f);
-          immWrite(baseAddr+ADDR_TL,0x7f);
-          oldWrites[baseAddr+ADDR_SL_RR]=-1;
-          oldWrites[baseAddr+ADDR_TL]=-1;
-          //rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
-        }
-      }
-      immWrite(0x28,0x00|konOffs[i]);
-      if (chan[i].hardReset && chan[i].keyOn) {
-        for (int j=0; j<4; j++) {
-          unsigned short baseAddr=chanOffs[i]|opOffs[j];
-          for (int k=0; k<100; k++) {
-            immWrite(baseAddr+ADDR_SL_RR,0x0f);
-          }
-        }
-      }
-      chan[i].keyOff=false;
-    }
   }
 
   for (int i=16; i<512; i++) {
@@ -638,6 +615,26 @@ void DivPlatformYM2610B::tick(bool sysTick) {
     }
   }
 
+  int hardResetElapsed=0;
+  bool mustHardReset=false;
+
+  for (int i=0; i<psgChanOffs; i++) {
+    if (i==2 && extMode) continue;
+    if (chan[i].keyOn || chan[i].keyOff) {
+      immWrite(0x28,0x00|konOffs[i]);
+      if (chan[i].hardReset && chan[i].keyOn) {
+        mustHardReset=true;
+        for (int j=0; j<4; j++) {
+          unsigned short baseAddr=chanOffs[i]|opOffs[j];
+          oldWrites[baseAddr+ADDR_SL_RR]=-1;
+          immWrite(baseAddr+ADDR_SL_RR,0x0f);
+          hardResetElapsed++;
+        }
+      }
+      chan[i].keyOff=false;
+    }
+  }
+
   for (int i=0; i<psgChanOffs; i++) {
     if (i==2 && extMode) continue;
     if (chan[i].freqChanged) {
@@ -659,10 +656,12 @@ void DivPlatformYM2610B::tick(bool sysTick) {
       if (chan[i].freq>0x3fff) chan[i].freq=0x3fff;
       immWrite(chanOffs[i]+ADDR_FREQH,chan[i].freq>>8);
       immWrite(chanOffs[i]+ADDR_FREQ,chan[i].freq&0xff);
+      hardResetElapsed+=2;
       chan[i].freqChanged=false;
     }
     if (chan[i].keyOn || chan[i].opMaskChanged) {
       immWrite(0x28,(chan[i].opMask<<4)|konOffs[i]);
+      hardResetElapsed++;
       chan[i].opMaskChanged=false;
       chan[i].keyOn=false;
     }
@@ -679,6 +678,7 @@ void DivPlatformYM2610B::tick(bool sysTick) {
         if (globalADPCMAVolume!=(chan[i].std.duty.val&0x3f)) {
           globalADPCMAVolume=chan[i].std.duty.val&0x3f;
           immWrite(0x101,globalADPCMAVolume);
+          hardResetElapsed++;
         }
       }
       if (chan[i].std.panL.had) {
@@ -691,6 +691,7 @@ void DivPlatformYM2610B::tick(bool sysTick) {
       }
       if (!isMuted[i] && (chan[i].std.vol.had || chan[i].std.panL.had)) {
         immWrite(0x108+(i-adpcmAChanOffs),isMuted[i]?0:((chan[i].pan<<6)|chan[i].outVol));
+        hardResetElapsed++;
       }
     }
     if (chan[i].keyOff) {
@@ -711,6 +712,7 @@ void DivPlatformYM2610B::tick(bool sysTick) {
     if (chan[adpcmBChanOffs].std.vol.had) {
       chan[adpcmBChanOffs].outVol=(chan[adpcmBChanOffs].vol*MIN(chan[adpcmBChanOffs].macroVolMul,chan[adpcmBChanOffs].std.vol.val))/chan[adpcmBChanOffs].macroVolMul;
       immWrite(0x1b,chan[adpcmBChanOffs].outVol);
+      hardResetElapsed++;
     }
 
     if (NEW_ARP_STRAT) {
@@ -737,6 +739,7 @@ void DivPlatformYM2610B::tick(bool sysTick) {
         chan[adpcmBChanOffs].pan=chan[adpcmBChanOffs].std.panL.val&3;
         if (!isMuted[adpcmBChanOffs]) {
           immWrite(0x11,(isMuted[adpcmBChanOffs]?0:(chan[adpcmBChanOffs].pan<<6)));
+          hardResetElapsed++;
         }
       }
     }
@@ -756,13 +759,16 @@ void DivPlatformYM2610B::tick(bool sysTick) {
       }
       immWrite(0x19,chan[adpcmBChanOffs].freq&0xff);
       immWrite(0x1a,(chan[adpcmBChanOffs].freq>>8)&0xff);
+      hardResetElapsed+=2;
     }
     if (chan[adpcmBChanOffs].keyOn || chan[adpcmBChanOffs].keyOff) {
       immWrite(0x10,0x01); // reset
+      hardResetElapsed++;
       if (chan[adpcmBChanOffs].active && chan[adpcmBChanOffs].keyOn && !chan[adpcmBChanOffs].keyOff) {
         if (chan[adpcmBChanOffs].sample>=0 && chan[adpcmBChanOffs].sample<parent->song.sampleLen) {
           DivSample* s=parent->getSample(chan[adpcmBChanOffs].sample);
           immWrite(0x10,(s->isLoopable())?0x90:0x80); // start/repeat
+          hardResetElapsed++;
         }
       }
       chan[adpcmBChanOffs].keyOn=false;
@@ -773,11 +779,13 @@ void DivPlatformYM2610B::tick(bool sysTick) {
 
   if (writeADPCMAOff) {
     immWrite(0x100,0x80|writeADPCMAOff);
+    hardResetElapsed++;
     writeADPCMAOff=0;
   }
 
   if (writeADPCMAOn) {
     immWrite(0x100,writeADPCMAOn);
+    hardResetElapsed++;
     writeADPCMAOn=0;
   }
 
@@ -787,8 +795,24 @@ void DivPlatformYM2610B::tick(bool sysTick) {
   for (DivRegWrite& i: ay->getRegisterWrites()) {
     if (i.addr>15) continue;
     immWrite(i.addr&15,i.val);
+    hardResetElapsed++;
   }
   ay->getRegisterWrites().clear();
+
+  // hard reset handling
+  if (mustHardReset) {
+    for (unsigned int i=hardResetElapsed; i<hardResetCycles; i++) {
+      immWrite(0xf0,i&0xff);
+    }
+    for (int i=0; i<psgChanOffs; i++) {
+      if (i==2 && extMode) continue;
+      if ((chan[i].keyOn || chan[i].opMaskChanged) && chan[i].hardReset) {
+        immWrite(0x28,(chan[i].opMask<<4)|konOffs[i]);
+        chan[i].opMaskChanged=false;
+        chan[i].keyOn=false;
+      }
+    }
+  }
 }
 
 void DivPlatformYM2610B::commitState(int ch, DivInstrument* ins) {