--- BasiliskII/src/emul_op.cpp 2001/07/03 15:59:45 1.25 +++ BasiliskII/src/emul_op.cpp 2001/07/09 11:21:59 1.26 @@ -440,7 +440,6 @@ void EmulOp(uint16 opcode, M68kRegisters if (HasMacStarted()) { // Mac has started, execute all 60Hz interrupt functions - ADBInterrupt(); TimerInterrupt(); VideoInterrupt(); @@ -457,7 +456,6 @@ void EmulOp(uint16 opcode, M68kRegisters if (InterruptFlags & INTFLAG_1HZ) { ClearInterruptFlag(INTFLAG_1HZ); - if (HasMacStarted()) { SonyInterrupt(); DiskInterrupt(); @@ -480,11 +478,16 @@ void EmulOp(uint16 opcode, M68kRegisters AudioInterrupt(); } + if (InterruptFlags & INTFLAG_ADB) { + ClearInterruptFlag(INTFLAG_ADB); + if (HasMacStarted()) + ADBInterrupt(); + } + if (InterruptFlags & INTFLAG_NMI) { ClearInterruptFlag(INTFLAG_NMI); - if (HasMacStarted()) { + if (HasMacStarted()) TriggerNMI(); - } } break;