diff options
| author | gene <gene@cvs.openbsd.org> | 1997-04-14 18:48:09 +0000 |
|---|---|---|
| committer | gene <gene@cvs.openbsd.org> | 1997-04-14 18:48:09 +0000 |
| commit | f9fb8c1d4aa9e92d8669c9059335d729b505c5c2 (patch) | |
| tree | d3b2f4d5d53636cb8c0dc6fec8c07957bf0c733e /sys/arch/mac68k/dev/adb_direct.c | |
| parent | bb6fa98d7de51d366e882712f55820f005d5c18e (diff) | |
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.
Diffstat (limited to 'sys/arch/mac68k/dev/adb_direct.c')
| -rw-r--r-- | sys/arch/mac68k/dev/adb_direct.c | 6 |
1 files changed, 3 insertions, 3 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) |