--- BasiliskII/src/emul_op.cpp	2005/01/30 21:42:13	1.32
+++ BasiliskII/src/emul_op.cpp	2010/02/21 12:00:01	1.37
@@ -1,7 +1,7 @@
 /*
  *  emul_op.cpp - 68k opcodes for ROM patches
  *
- *  Basilisk II (C) 1997-2005 Christian Bauer
+ *  Basilisk II (C) 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
@@ -70,7 +70,7 @@ void EmulOp(uint16 opcode, M68kRegisters
 				   r->sr);
 			VideoQuitFullScreen();
 #ifdef ENABLE_MON
-			char *arg[4] = {"mon", "-m", "-r", NULL};
+			const char *arg[4] = {"mon", "-m", "-r", NULL};
 			mon(3, arg);
 #endif
 			QuitEmulator();
@@ -236,9 +236,11 @@ void EmulOp(uint16 opcode, M68kRegisters
 
 			// Install PutScrap() patch
 			M68kRegisters r;
-			r.d[0] = 0xa9fe;
-			r.a[0] = PutScrapPatch;
-			Execute68kTrap(0xa647, &r);		// SetToolTrap()
+			if (PutScrapPatch) {
+				r.d[0] = 0xa9fe;
+				r.a[0] = PutScrapPatch;
+				Execute68kTrap(0xa647, &r);	// SetToolTrap()
+			}
 
 			// Install GetScrap() patch
 			if (GetScrapPatch) {
@@ -353,7 +355,7 @@ void EmulOp(uint16 opcode, M68kRegisters
 			break;
 
 		case M68K_EMUL_OP_ETHER_READ_PACKET:
-			EtherReadPacket((uint8 **)&r->a[0], r->a[3], r->d[3], r->d[1]);
+			EtherReadPacket(r->a[0], r->a[3], r->d[3], r->d[1]);
 			break;
 
 		case M68K_EMUL_OP_SOUNDIN_OPEN:		// Sound input driver functions
@@ -555,6 +557,13 @@ void EmulOp(uint16 opcode, M68kRegisters
 			r->d[0] = DebugUtil(r->d[0]);
 			break;
 
+		case M68K_EMUL_OP_IDLE_TIME:	// SynchIdleTime() patch
+			// Sleep if no events pending
+			if (ReadMacInt32(0x14c) == 0)
+				idle_wait();
+			r->a[0] = ReadMacInt32(0x2b6);
+			break;
+
 		default:
 			printf("FATAL: EMUL_OP called with bogus opcode %08x\n", opcode);
 			printf("d0 %08x d1 %08x d2 %08x d3 %08x\n"
@@ -566,7 +575,7 @@ void EmulOp(uint16 opcode, M68kRegisters
 				   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);
 #ifdef ENABLE_MON
-			char *arg[4] = {"mon", "-m", "-r", NULL};
+			const char *arg[4] = {"mon", "-m", "-r", NULL};
 			mon(3, arg);
 #endif
 			QuitEmulator();