[src/netbsd-1-5]: src/sys/arch/mac68k/dev Pull up rev 1.44 from scottr (appro...

[scottr <scottr%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7be1a795aed
branches:  netbsd-1-5
changeset: 489563:f7be1a795aed
user:      scottr <scottr%NetBSD.org@localhost>
date:      Thu Sep 28 19:02:03 2000 +0000

description:
Pull up rev 1.44 from scottr (approved by thorpej):
  Set up ADB hardware type before making decisions based on same.

diffstat:

 sys/arch/mac68k/dev/adb_direct.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r a5c7664a10fc -r f7be1a795aed sys/arch/mac68k/dev/adb_direct.c
--- a/sys/arch/mac68k/dev/adb_direct.c  Thu Sep 28 18:48:50 2000 +0000
+++ b/sys/arch/mac68k/dev/adb_direct.c  Thu Sep 28 19:02:03 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adb_direct.c,v 1.42.4.1 2000/09/21 13:03:11 scottr Exp $       */
+/*     $NetBSD: adb_direct.c,v 1.42.4.2 2000/09/28 19:02:03 scottr Exp $       */
 
 /* From: adb_direct.c 2.02 4/18/97 jpw */
 
@@ -2103,6 +2103,8 @@
        int device;
        int nonewtimes;         /* times thru loop w/o any new devices */
 
+       adb_setup_hw_type();    /* setup hardware type */
+
        /* Make sure we are not interrupted while building the table. */
        /* ints must be on for PB & IOP (at least, for now) */
        if (adbHardware != ADB_HW_PB && adbHardware != ADB_HW_IOP)
@@ -2124,8 +2126,6 @@
                ADBDevTable[i].origAddr = ADBDevTable[i].currentAddr = 0;
        }
 
-       adb_setup_hw_type();    /* setup hardware type */
-
        adb_hw_setup();         /* init the VIA bits and hard reset ADB */
 
        delay(1000);