Author: bschmidt
Date: Sun Mar 25 11:42:59 2012
New Revision: 233461
URL: http://svn.freebsd.org/changeset/base/233461
Log:
MFC r233283:
Load the firmware during init not attach, as a root filesystem might
not yet be available. While here, also print the firmware version.
Submitted by: PseudoCylon
Modified:
stable/8/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/dev/usb/wlan/if_run.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_run.c Sun Mar 25 10:59:40 2012
(r233460)
+++ stable/8/sys/dev/usb/wlan/if_run.c Sun Mar 25 11:42:59 2012
(r233461)
@@ -598,12 +598,6 @@ run_attach(device_t self)
sc->mac_ver, sc->mac_rev, run_get_rf(sc->rf_rev),
sc->ntxchains, sc->nrxchains, ether_sprintf(sc->sc_bssid));
- if ((error = run_load_microcode(sc)) != 0) {
- device_printf(sc->sc_dev, "could not load 8051 microcode\n");
- RUN_UNLOCK(sc);
- goto detach;
- }
-
RUN_UNLOCK(sc);
ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211);
@@ -1044,8 +1038,9 @@ run_load_microcode(struct run_softc *sc)
error = ETIMEDOUT;
goto fail;
}
- device_printf(sc->sc_dev, "firmware %s loaded\n",
- (base == fw->data) ? "RT2870" : "RT3071");
+ device_printf(sc->sc_dev, "firmware %s ver. %u.%u loaded\n",
+ (base == fw->data) ? "RT2870" : "RT3071",
+ *(base + 4092), *(base + 4093));
fail:
firmware_put(fw, FIRMWARE_UNLOAD);
@@ -4598,6 +4593,11 @@ run_init_locked(struct run_softc *sc)
run_stop(sc);
+ if (run_load_microcode(sc) != 0) {
+ device_printf(sc->sc_dev, "could not load 8051 microcode\n");
+ goto fail;
+ }
+
for (ntries = 0; ntries < 100; ntries++) {
if (run_read(sc, RT2860_ASIC_VER_ID, &tmp) != 0)
goto fail;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
