--- BasiliskII/src/disk.cpp	1999/10/12 20:00:43	1.2
+++ BasiliskII/src/disk.cpp	2000/07/14 21:29:08	1.6
@@ -1,7 +1,7 @@
 /*
  *  disk.cpp - Generic disk driver
  *
- *  Basilisk II (C) 1997-1999 Christian Bauer
+ *  Basilisk II (C) 1997-2000 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
@@ -90,9 +90,6 @@ static DriveInfo *first_drive_info;
 // Icon address (Mac address space, set by PatchROM())
 uint32 DiskIconAddr;
 
-// Number of ticks between checks for disk insertion
-const int driver_delay = 120;
-
 // Flag: Control(accRun) has been called, interrupt routine is now active
 static bool acc_run_called = false;
 
@@ -268,7 +265,7 @@ int16 DiskOpen(uint32 pb, uint32 dce)
 				info->num_blocks = SysGetFileSize(info->fh) / 512;
 				info->to_be_mounted = true;
 			}
-			D(bug(" %ld blocks\n", info->num_blocks));
+			D(bug(" %d blocks\n", info->num_blocks));
 			WriteMacInt16(info->status + dsDriveSize, info->num_blocks & 0xffff);
 			WriteMacInt16(info->status + dsDriveS1, info->num_blocks >> 16);
 
@@ -484,7 +481,7 @@ int16 DiskStatus(uint32 pb, uint32 dce)
 	// Drive-specific codes
 	switch (code) {
 		case 8:		// Get drive status
-			memcpy(Mac2HostAddr(pb + csParam), Mac2HostAddr(info->status), 22);
+			Mac2Mac_memcpy(pb + csParam, info->status, 22);
 			return noErr;
 
 		default:
@@ -495,18 +492,13 @@ int16 DiskStatus(uint32 pb, uint32 dce)
 
 
 /*
- *  Driver interrupt routine - check for volumes to be mounted
+ *  Driver interrupt routine (1Hz) - check for volumes to be mounted
  */
 
 void DiskInterrupt(void)
 {
-	static int tick_count = 0;
 	if (!acc_run_called)
 		return;
 
-	tick_count++;
-	if (tick_count > driver_delay) {
-		tick_count = 0;
-		mount_mountable_volumes();
-	}
+	mount_mountable_volumes();
 }