diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-08-04 12:24:47 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-08-04 12:24:47 +0000 |
| commit | 8e8fe6daa4a7b238cd227f2b3a5f4f487517664f (patch) | |
| tree | 66e37ae4543583d5291738883a51b44cfb2613ab | |
| parent | cc4c9d33602a7dc3dec5da657ee749404a23353d (diff) | |
Use ACX100 radio 11 firmware for ACX100 radio 11.
ok mglocker@
| -rw-r--r-- | sys/dev/ic/acx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c index 8c9c5060f49..71562d43107 100644 --- a/sys/dev/ic/acx.c +++ b/sys/dev/ic/acx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx.c,v 1.11 2006/08/04 11:58:26 jsg Exp $ */ +/* $OpenBSD: acx.c,v 1.12 2006/08/04 12:24:46 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -204,7 +204,7 @@ int acx_copyin_firmware(struct acx_softc *, struct ifreq *); void acx_free_firmware(struct acx_softc *); int acx_load_firmware(struct acx_softc *, uint32_t, const uint8_t *, int); -int acx_load_radio_firmware(struct acx_softc *); +int acx_load_radio_firmware(struct acx_softc *, const char *); int acx_load_base_firmware(struct acx_softc *, const char *); struct ieee80211_node *acx_node_alloc(struct ieee80211com *); @@ -437,7 +437,8 @@ acx_init(struct ifnet *ifp) /* ACX111 firmware is combined */ if (!(sc->sc_flags & ACX_FLAG_ACX111)) { - error = acx_load_radio_firmware(sc); + error = acx_load_radio_firmware(sc, (sc->sc_radio_type == 11) ? + "tiacx100r11" : "tiacx100r0D"); if (error) goto back; } @@ -1513,14 +1514,13 @@ acx_load_base_firmware(struct acx_softc *sc, const char *name) } int -acx_load_radio_firmware(struct acx_softc *sc) +acx_load_radio_firmware(struct acx_softc *sc, const char *name) { struct ifnet *ifp = &sc->sc_ic.ic_if; struct acx_conf_mmap mem_map; uint32_t radio_fw_ofs; int error; uint8_t *ucode; - const char name[] = "tiacx100r0D"; size_t size; error = loadfirmware(name, &ucode, &size); |