diff options
| author |   damien <damien@openbsd.org> | 2006-07-19 19:18:11 +0000 |
|---|---|---|
| committer | damien <damien@openbsd.org> | 2006-07-19 19:18:11 +0000 |
| commit | e0d596c418bafa4f30f921bc213aee73612251e5 (patch) | |
| tree | e70147df55b077039b6ed88fb1dff56a7f2b26e3 /sys/dev/usb/if_rum.c | |
| parent | define rum_read() as rum_read_multi(). (diff) | |
| download | wireguard-openbsd-e0d596c418bafa4f30f921bc213aee73612251e5.tar.xz wireguard-openbsd-e0d596c418bafa4f30f921bc213aee73612251e5.zip | |
wait for chip to settle *before* retrieving ASIC revision number since
waiting for the chip to settle means waiting until ASIC revision number
is different from zero.
Diffstat (limited to 'sys/dev/usb/if_rum.c')
| -rw-r--r-- | sys/dev/usb/if_rum.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index 17e409522fc..7a9c7ee2d7a 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.17 2006/07/19 19:15:04 damien Exp $ */ +/* $OpenBSD: if_rum.c,v 1.18 2006/07/19 19:18:11 damien Exp $ */ /*- * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr> * Copyright (c) 2006 Niall O'Higgins <niallo@openbsd.org> @@ -291,20 +291,9 @@ USB_ATTACH(rum) usb_init_task(&sc->sc_task, rum_task, sc); timeout_set(&sc->scan_ch, rum_next_scan, sc); - /* retrieve RT2573 rev. no */ - sc->asic_rev = rum_read(sc, RT2573_MAC_CSR0); - - /* retrieve MAC address and various other things from EEPROM */ - rum_read_eeprom(sc); - - printf("%s: MAC/BBP RT%02x (rev 0x%02x), RF %s, address %s\n", - USBDEVNAME(sc->sc_dev), sc->macbbp_rev, sc->asic_rev, - rum_get_rf(sc->rf_rev), ether_sprintf(ic->ic_myaddr)); - /* wait for chip to settle */ for (ntries = 0; ntries < 1000; ntries++) { - tmp = rum_read(sc, RT2573_MAC_CSR0); - if (tmp != 0) + if ((tmp = rum_read(sc, RT2573_MAC_CSR0)) != 0) break; DELAY(1000); } @@ -314,6 +303,16 @@ USB_ATTACH(rum) USB_ATTACH_ERROR_RETURN; } + /* retrieve RT2573 rev. no */ + sc->asic_rev = tmp; + + /* retrieve MAC address and various other things from EEPROM */ + rum_read_eeprom(sc); + + printf("%s: MAC/BBP RT%02x (rev 0x%02x), RF %s, address %s\n", + USBDEVNAME(sc->sc_dev), sc->macbbp_rev, sc->asic_rev, + rum_get_rf(sc->rf_rev), ether_sprintf(ic->ic_myaddr)); + if (rootvp == NULL) mountroothook_establish(rum_attachhook, sc); else |