patch-2.1.106 linux/arch/m68k/mac/adb-bus.c

• Lines: 77
• Date: Sat Jun 13 13:14:33 1998
• Orig file: v2.1.105/linux/arch/m68k/mac/adb-bus.c
• Orig date: Fri May 8 23:14:42 1998

diff -u --recursive --new-file v2.1.105/linux/arch/m68k/mac/adb-bus.c linux/arch/m68k/mac/adb-bus.c
@@ -93,6 +93,9 @@
 
 static int status = ST_IDLE|TREQ;
 static int last_status;
+
+static int driver_running = 0;
+
 /*static int adb_delay;*/
 int in_keybinit = 1;
 
@@ -106,11 +109,15 @@
 static void adb_hw_setup_IIsi(void);
 
 /*
- * Misc. defines for testing 
+ * debug level 10 required for ADB logging (should be && debug_adb, ideally)
  */
 
 extern int console_loglevel;
 
+/*
+ * Misc. defines for testing - should go to header :-(
+ */
+
 #define ADBDEBUG_STATUS		(1)
 #define ADBDEBUG_STATE		(2)
 #define ADBDEBUG_READ		(4)
@@ -128,7 +135,7 @@
 #define ADBDEBUG_IISI		(8192)
 
 
-#define DEBUG_ADB
+/*#define DEBUG_ADB*/
 
 #ifdef DEBUG_ADB
 #define ADBDEBUG	(ADBDEBUG_INPUT | ADBDEBUG_READ | ADBDEBUG_START | ADBDEBUG_WRITE | ADBDEBUG_SRQ | ADBDEBUG_REQUEST)
@@ -857,10 +864,22 @@
 void adb_interrupt(int irq, void *arg, struct pt_regs *regs)
 {
 	int x, adbdir;
+	unsigned long flags;
 	struct adb_request *req;
 
 	last_status = status;
 
+	/* prevent races due to SCSI enabling ints */
+	save_flags(flags);
+	cli();
+
+	if (driver_running) {
+		restore_flags(flags);
+		return;
+	}
+
+	driver_running = 1;
+	
 #ifdef USE_ORIG
 	status = (~via_read(via1, vBufB) & (TIP|TREQ)) | (via_read(via1, vACR) & SR_OUT);
 #else
@@ -877,7 +896,6 @@
 			adb_state, status, last_status, adbdir);
 #endif
 
-
 	switch (adb_state) 
 	{
 		case idle:
@@ -1614,6 +1632,9 @@
 			printk("adb_interrupt: unknown adb_state %d?\n", adb_state);
 #endif
 	}
+	/* reset mutex and interrupts */
+	driver_running = 0;
+	restore_flags(flags);
 }
 
 /*