Bring our incarnation of John Wittowski's direct adb driver into compatible

state with NetBSD's.  The direct-to-ADB code is now enabled by default.
Using 'options MRG_ADB' will cause the kernel to revert to the 'old standby'
code.

3 files changed, 11 insertions, 10 deletions

diff --git a/sys/arch/mac68k/dev/adb_direct.c b/sys/arch/mac68k/dev/adb_direct.c
index 885047457a6..3d1d81fb324 100644
--- a/sys/arch/mac68k/dev/adb_direct.c
+++ b/sys/arch/mac68k/dev/adb_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb_direct.c,v 1.4 1997/04/07 01:22:15 briggs Exp $	*/
+/*	$OpenBSD: adb_direct.c,v 1.5 1997/04/14 18:47:53 gene Exp $	*/
 /*  adb_direct.c 1.91 1/20/97 jpw */
 
 /*
@@ -1936,7 +1936,7 @@ set_adb_info(ADBSetInfoBlock * info, int adbAddr)
 
 }
 
-#ifdef HWDIRECT
+#ifndef MRG_ADB
 long
 mrg_adbintr(void)
 {
@@ -2163,7 +2163,7 @@ adb_prog_switch_disable(void)
         }
 }                               /* adb_prog_switch_disable */
 
-#ifdef HWDIRECT
+#ifndef MRG_ADB
 
 int 
 CountADBs(void)
diff --git a/sys/arch/mac68k/dev/adbsys.c b/sys/arch/mac68k/dev/adbsys.c
index efe5c271d92..95369269adc 100644
--- a/sys/arch/mac68k/dev/adbsys.c
+++ b/sys/arch/mac68k/dev/adbsys.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adbsys.c,v 1.8 1997/04/03 03:53:27 briggs Exp $	*/
+/*	$OpenBSD: adbsys.c,v 1.9 1997/04/14 18:47:55 gene Exp $	*/
 /*	$NetBSD: adbsys.c,v 1.24 1997/01/13 07:01:23 scottr Exp $	*/
 
 /*-
@@ -183,8 +183,9 @@ adb_init()
 	}
 #endif
 
-#ifndef HWDIRECT		/* We don't care about ADB ROM driver if we are
-				 * using the HWDIRECT method for ADB/PRAM/RTC. */
+#ifdef MRG_ADB			/* We don't care about ADB ROM driver if we
+				 * aren't using the MRG_ADB method for
+				 * ADB/PRAM/RTC. */
 	if (!mrg_romready()) {
 		printf("adb: no ROM ADB driver in this kernel for this machine\n");
 		return;
@@ -206,10 +207,10 @@ adb_init()
 	/*
 	 * Initialize ADB
 	 *
-	 * If using HWDIRECT method to access ADB, then call
+	 * If not using MRG_ADB method to access ADB, then call
 	 * ADBReInit directly.  Otherwise use ADB AlternateInit()
 	 */
-#ifdef HWDIRECT
+#ifndef MRG_ADB
 	printf("adb: calling ADBReInit\n");
 	ADBReInit();
 #else
diff --git a/sys/arch/mac68k/dev/adbvar.h b/sys/arch/mac68k/dev/adbvar.h
index 3070587e981..b6335ff936d 100644
--- a/sys/arch/mac68k/dev/adbvar.h
+++ b/sys/arch/mac68k/dev/adbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adbvar.h,v 1.5 1997/02/23 06:04:55 briggs Exp $	*/
+/*	$OpenBSD: adbvar.h,v 1.6 1997/04/14 18:47:56 gene Exp $	*/
 /*	$NetBSD: adbvar.h,v 1.5 1997/01/13 07:01:24 scottr Exp $	*/
 
 /*-
@@ -67,7 +67,7 @@ void	extdms_complete __P((void));
 void	adb_complete __P((caddr_t buffer, caddr_t data_area, int adb_command));
 void	extdms_init __P((int));
 
-#ifdef HWDIRECT
+#ifndef MRG_ADB
 
 /* types of adb hardware that we (will eventually) support */
 #define ADB_HW_UNKNOWN		0x01	/* don't know */