summaryrefslogtreecommitdiffstats
path: root/sys/dev/ipw
diff options
context:
space:
mode:
authorluigi <luigi@FreeBSD.org>2007-02-15 17:21:31 +0000
committerluigi <luigi@FreeBSD.org>2007-02-15 17:21:31 +0000
commitbc574e3db59556a1916c0cc5fff80cc0ba8b3f94 (patch)
tree8756dca03e08a58907b842fa664348bb2f5be1b9 /sys/dev/ipw
parente4fd22cf43d4208089c593c1aa811026cb91ca43 (diff)
downloadFreeBSD-src-bc574e3db59556a1916c0cc5fff80cc0ba8b3f94.zip
FreeBSD-src-bc574e3db59556a1916c0cc5fff80cc0ba8b3f94.tar.gz
Cleanup and document the implementation of firmware(9) based on
a version that i posted earlier on the -current mailing list, and subsequent feedback received. The core of the change is just in sys/firmware.h and kern/subr_firmware.c, while other files are just adaptation of the clients to the ABI change (const-ification of some parameters and hiding of internal info, so this is fully compatible at the binary level). In detail: - reduce the amount of information exported to clients in struct firmware, and constify the pointer; - internally, document and simplify the implementation of the various functions, and make sure error conditions are dealt with properly. The diffs are large, but the code is really straightforward now (i hope). Note also that there is a subtle issue with the implementation of firmware_register(): currently, as in the previous version, we just store a reference to the 'imagename' argument, but we should rather copy it because there is no guarantee that this is a static string. I realised this while testing this code, but i prefer to fix it in a later commit -- there is no regression with respect to the past. Note, too, that the version in RELENG_6 has various bugs including missing locks around the module release calls, mishandling of modules loaded by /boot/loader, and so on, so an MFC is absolutely necessary there. I was just postponing it until this cleanup to avoid doing things twice. MFC after: 1 week
Diffstat (limited to 'sys/dev/ipw')
-rw-r--r--sys/dev/ipw/if_ipw.c2
-rw-r--r--sys/dev/ipw/if_ipwvar.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c
index 69761f6..7534949 100644
--- a/sys/dev/ipw/if_ipw.c
+++ b/sys/dev/ipw/if_ipw.c
@@ -1956,7 +1956,7 @@ ipw_init(void *priv)
struct ipw_softc *sc = priv;
struct ieee80211com *ic = &sc->sc_ic;
struct ifnet *ifp = ic->ic_ifp;
- struct firmware *fp;
+ const struct firmware *fp;
const struct ipw_firmware_hdr *hdr;
const char *imagename, *fw;
int owned;
diff --git a/sys/dev/ipw/if_ipwvar.h b/sys/dev/ipw/if_ipwvar.h
index 3cfb77e..c97d6a8 100644
--- a/sys/dev/ipw/if_ipwvar.h
+++ b/sys/dev/ipw/if_ipwvar.h
@@ -99,7 +99,7 @@ struct ipw_softc {
bus_space_tag_t sc_st;
bus_space_handle_t sc_sh;
void *sc_ih;
- struct firmware *sc_firmware;
+ const struct firmware *sc_firmware;
int sc_tx_timer;
OpenPOWER on IntegriCloud