--- BasiliskII/src/emul_op.cpp	1999/10/03 14:16:25	1.1
+++ BasiliskII/src/emul_op.cpp	1999/10/19 19:28:11	1.5
@@ -39,6 +39,7 @@
 #include "video.h"
 #include "audio.h"
 #include "ether.h"
+#include "extfs.h"
 #include "emul_op.h"
 
 #define DEBUG 0
@@ -152,9 +153,8 @@ void EmulOp(uint16 opcode, M68kRegisters
 					}
 				} else if (reg < 0x08 && is_read) {
 					uint32 t = TimerDateTime();
-					uint8 b;
+					uint8 b = t;
 					switch (reg & 3) {
-						case 0: b = t; break;
 						case 1: b = t >> 8; break;
 						case 2: b = t >> 16; break;
 						case 3: b = t >> 24; break;
@@ -296,15 +296,15 @@ void EmulOp(uint16 opcode, M68kRegisters
 			break;
 
 		case M68K_EMUL_OP_VIDEO_OPEN:		// Video driver functions
-			r->d[0] = VideoOpen(r->a[0], r->a[1]);
+			r->d[0] = VideoDriverOpen(r->a[0], r->a[1]);
 			break;
 
 		case M68K_EMUL_OP_VIDEO_CONTROL:
-			r->d[0] = VideoControl(r->a[0], r->a[1]);
+			r->d[0] = VideoDriverControl(r->a[0], r->a[1]);
 			break;
 
 		case M68K_EMUL_OP_VIDEO_STATUS:
-			r->d[0] = VideoStatus(r->a[0], r->a[1]);
+			r->d[0] = VideoDriverStatus(r->a[0], r->a[1]);
 			break;
 
 		case M68K_EMUL_OP_SERIAL_OPEN:		// Serial driver functions
@@ -435,10 +435,13 @@ void EmulOp(uint16 opcode, M68kRegisters
 				ClearInterruptFlag(INTFLAG_60HZ);
 				if (HasMacStarted()) {
 
-					// Mac has started, execute video, ADB and Time Manager interrupt functions
+					// Mac has started, execute all 60Hz interrupt functions
 					ADBInterrupt();
 					TimerInterrupt();
 					VideoInterrupt();
+					SonyInterrupt();
+					DiskInterrupt();
+					CDROMInterrupt();
 
 					// Call DoVBLTask(0)
 					if (ROMVersion == ROM_VERSION_32) {
@@ -490,6 +493,14 @@ void EmulOp(uint16 opcode, M68kRegisters
 			r->d[0] = AudioDispatch(r->a[3], r->a[4]);
 			break;
 
+		case M68K_EMUL_OP_EXTFS_COMM:		// External file system routines
+			WriteMacInt16(r->a[7] + 14, ExtFSComm(ReadMacInt16(r->a[7] + 12), ReadMacInt32(r->a[7] + 8), ReadMacInt32(r->a[7] + 4)));
+			break;
+
+		case M68K_EMUL_OP_EXTFS_HFS:
+			WriteMacInt16(r->a[7] + 20, ExtFSHFS(ReadMacInt32(r->a[7] + 16), ReadMacInt16(r->a[7] + 14), ReadMacInt32(r->a[7] + 10), ReadMacInt32(r->a[7] + 6), ReadMacInt16(r->a[7] + 4)));
+			break;
+
 		default:
 			printf("FATAL: EMUL_OP called with bogus opcode %08x\n", opcode);
 			printf("d0 %08lx d1 %08lx d2 %08lx d3 %08lx\n"