diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-02-01 17:04:27 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-02-01 17:04:27 +0000 |
| commit | f03186c89d911f12c50bdb3b223e1f2a2976686c (patch) | |
| tree | ce779b0b7017c7529c561bf9ed072bb4229c0722 /sys/arch | |
| parent | d3888abe756c8e731b5098fdaba9f1a4b3b37bab (diff) | |
Revert 1.28, rumoured to cause problems on some machines.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/macppc/dev/adb.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c index c0abe9406e8..8f098372586 100644 --- a/sys/arch/macppc/dev/adb.c +++ b/sys/arch/macppc/dev/adb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb.c,v 1.28 2009/01/29 21:17:49 miod Exp $ */ +/* $OpenBSD: adb.c,v 1.29 2009/02/01 17:04:26 miod Exp $ */ /* $NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $ */ /* $NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $ */ @@ -1665,8 +1665,7 @@ adbattach(struct device *parent, struct device *self, void *aux) } adb_polling = 1; - if (!adbempty) - adb_reinit(); + adb_reinit(); mac_intr_establish(parent, ca->ca_intr[0], IST_LEVEL, IPL_HIGH, adb_intr, sc, sc->sc_dev.dv_xname); @@ -1679,10 +1678,7 @@ adbattach(struct device *parent, struct device *self, void *aux) if (adb_debug) printf("adb: done with adb_reinit\n"); #endif - if (adbempty) - totaladbs = 0; - else - totaladbs = count_adbs(); + totaladbs = count_adbs(); printf(" irq %d: %s, %d target%s\n", ca->ca_intr[0], ca->ca_name, totaladbs, (totaladbs == 1) ? "" : "s"); @@ -1719,14 +1715,12 @@ adbattach(struct device *parent, struct device *self, void *aux) } } - if (!adbempty) { - if (adbHardware == ADB_HW_CUDA) - adb_cuda_fileserver_mode(); - if (adbHardware == ADB_HW_PMU) - pmu_fileserver_mode(1); + if (adbHardware == ADB_HW_CUDA) + adb_cuda_fileserver_mode(); + if (adbHardware == ADB_HW_PMU) + pmu_fileserver_mode(1); - if (adbHardware == ADB_HW_CUDA) - adb_cuda_autopoll(); - adb_polling = 0; - } + if (adbHardware == ADB_HW_CUDA) + adb_cuda_autopoll(); + adb_polling = 0; } |