--- BasiliskII/src/emul_op.cpp 2001/01/30 07:27:23 1.22 +++ BasiliskII/src/emul_op.cpp 2001/07/03 15:59:45 1.25 @@ -1,7 +1,7 @@ /* * emul_op.cpp - 68k opcodes for ROM patches * - * Basilisk II (C) 1997-2000 Christian Bauer + * Basilisk II (C) 1997-2001 Christian Bauer * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -68,6 +68,7 @@ void EmulOp(uint16 opcode, M68kRegisters r->d[0], r->d[1], r->d[2], r->d[3], r->d[4], r->d[5], r->d[6], r->d[7], r->a[0], r->a[1], r->a[2], r->a[3], r->a[4], r->a[5], r->a[6], r->a[7], r->sr); + VideoQuitFullScreen(); #ifdef ENABLE_MON char *arg[4] = {"mon", "-m", "-r", NULL}; mon(3, arg); @@ -248,22 +249,6 @@ void EmulOp(uint16 opcode, M68kRegisters WriteMacInt8(asc_regs + 0x800, 0x0f); // Set ASC version number WriteMacInt32(0xcc0, asc_regs); // Set ASCBase } - -#if (REAL_ADDRESSING || DIRECT_ADDRESSING) && defined(USE_SCRATCHMEM_SUBTERFUGE) - extern uint8 *ScratchMem; - - // Set VIA base address to scratch memory area - D(bug("Patch VIA base address [0x%x] to ScratchMem\n", ReadMacInt32(0x1d4))); - WriteMacInt32(0x1d4, Host2MacAddr(ScratchMem)); - - // Set SCCRd base address to scratch memory area - D(bug("Patch SCCRd base address [0x%x] to ScratchMem\n", ReadMacInt32(0x1d8))); - WriteMacInt32(0x1d8, Host2MacAddr(ScratchMem)); - - // Set SCCWr base address to scratch memory area - D(bug("Patch SCCWr base address [0x%x] to ScratchMem\n", ReadMacInt32(0x1dc))); - WriteMacInt32(0x1dc, Host2MacAddr(ScratchMem)); -#endif break; }