diff options
author | imp <imp@FreeBSD.org> | 2003-04-08 15:36:43 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2003-04-08 15:36:43 +0000 |
commit | db67e9740fc0aae663db29df4b31f6b65bc638c2 (patch) | |
tree | 90dd206909485f53d7d95741b0836bcacc7d36a3 | |
parent | ec272b22bce8996c423db241590efaac932a32c7 (diff) | |
download | FreeBSD-src-db67e9740fc0aae663db29df4b31f6b65bc638c2.zip FreeBSD-src-db67e9740fc0aae663db29df4b31f6b65bc638c2.tar.gz |
Use the new _ND macros to not include the description strings. If any
of the entries have a description, we'll use that to override the
description that the pccard layer generates for us.
This saves about 930 bytes in the module, so I feel it won't hurt the
crowded boot disks....
# other modules to follow
-rw-r--r-- | sys/dev/wi/if_wi_pccard.c | 83 |
1 files changed, 43 insertions, 40 deletions
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c index a17adfb..3188416 100644 --- a/sys/dev/wi/if_wi_pccard.c +++ b/sys/dev/wi/if_wi_pccard.c @@ -121,43 +121,43 @@ MODULE_DEPEND(if_wi, wlan, 1, 1, 1); #if __FreeBSD_version >= 500000 static const struct pccard_product wi_pccard_products[] = { - PCMCIA_CARD(3COM, 3CRWE737A, 0), - PCMCIA_CARD(3COM, 3CRWE777A, 0), - PCMCIA_CARD(ACTIONTEC, PRISM, 0), - PCMCIA_CARD(ADDTRON, AWP100, 0), - PCMCIA_CARD(ALLIEDTELESIS, WR211PCM, 0), - PCMCIA_CARD(BAY, EMOBILITY_11B, 0), - PCMCIA_CARD(BUFFALO, WLI_PCM_S11, 0), - PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0), - PCMCIA_CARD(COMPAQ, NC5004, 0), - PCMCIA_CARD(CONTEC, FX_DS110_PCC, 0), - PCMCIA_CARD(COREGA, WIRELESS_LAN_PCC_11, 0), - PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCA_11, 0), - PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCB_11, 0), - PCMCIA_CARD(DLINK, DWL650H, 0), - PCMCIA_CARD(ELSA, XI300_IEEE, 0), - PCMCIA_CARD(ELSA, XI325_IEEE, 0), - PCMCIA_CARD(ELSA, XI800_IEEE, 0), - PCMCIA_CARD(EMTAC, WLAN, 0), - PCMCIA_CARD(ERICSSON, WIRELESSLAN, 0), - PCMCIA_CARD(GEMTEK, WLAN, 0), - PCMCIA_CARD(HWN, AIRWAY80211, 0), - PCMCIA_CARD(INTEL, PRO_WLAN_2011, 0), - PCMCIA_CARD(INTERSIL, PRISM2, 0), - PCMCIA_CARD(IODATA2, WNB11PCM, 0), - PCMCIA_CARD(LINKSYS2, IWN, 0), - PCMCIA_CARD(LINKSYS2, IWN3, 0), - PCMCIA_CARD(LINKSYS2, WCF11, 0), - PCMCIA_CARD(LUCENT, WAVELAN_IEEE, 0), - PCMCIA_CARD(NETGEAR_2, MA401RA, 0), - PCMCIA_CARD(NOKIA, C110_WLAN, 0), - PCMCIA_CARD(PLANEX_2, GWNS11H, 0), - PCMCIA_CARD(PROXIM, RANGELANDS_8430, 0), - PCMCIA_CARD(SAMSUNG, SWL_2000N, 0), - PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT, 0), - PCMCIA_CARD(SOCKET, LP_WLAN_CF, 0), - PCMCIA_CARD(SYMBOL, LA4100, 0), - PCMCIA_CARD(TDK, LAK_CD011WL, 0), + PCMCIA_CARD_ND(3COM, 3CRWE737A, 0), + PCMCIA_CARD_ND(3COM, 3CRWE777A, 0), + PCMCIA_CARD_ND(ACTIONTEC, PRISM, 0), + PCMCIA_CARD_ND(ADDTRON, AWP100, 0), + PCMCIA_CARD_ND(ALLIEDTELESIS, WR211PCM, 0), + PCMCIA_CARD_ND(BAY, EMOBILITY_11B, 0), + PCMCIA_CARD_ND(BUFFALO, WLI_PCM_S11, 0), + PCMCIA_CARD_ND(BUFFALO, WLI_CF_S11G, 0), + PCMCIA_CARD_ND(COMPAQ, NC5004, 0), + PCMCIA_CARD_ND(CONTEC, FX_DS110_PCC, 0), + PCMCIA_CARD_ND(COREGA, WIRELESS_LAN_PCC_11, 0), + PCMCIA_CARD_ND(COREGA, WIRELESS_LAN_PCCA_11, 0), + PCMCIA_CARD_ND(COREGA, WIRELESS_LAN_PCCB_11, 0), + PCMCIA_CARD_ND(DLINK, DWL650H, 0), + PCMCIA_CARD_ND(ELSA, XI300_IEEE, 0), + PCMCIA_CARD_ND(ELSA, XI325_IEEE, 0), + PCMCIA_CARD_ND(ELSA, XI800_IEEE, 0), + PCMCIA_CARD_ND(EMTAC, WLAN, 0), + PCMCIA_CARD_ND(ERICSSON, WIRELESSLAN, 0), + PCMCIA_CARD_ND(GEMTEK, WLAN, 0), + PCMCIA_CARD_ND(HWN, AIRWAY80211, 0), + PCMCIA_CARD_ND(INTEL, PRO_WLAN_2011, 0), + PCMCIA_CARD_ND(INTERSIL, PRISM2, 0), + PCMCIA_CARD_ND(IODATA2, WNB11PCM, 0), + PCMCIA_CARD_ND(LINKSYS2, IWN, 0), + PCMCIA_CARD_ND(LINKSYS2, IWN3, 0), + PCMCIA_CARD_ND(LINKSYS2, WCF11, 0), + PCMCIA_CARD_ND(LUCENT, WAVELAN_IEEE, 0), + PCMCIA_CARD_ND(NETGEAR_2, MA401RA, 0), + PCMCIA_CARD_ND(NOKIA, C110_WLAN, 0), + PCMCIA_CARD_ND(PLANEX_2, GWNS11H, 0), + PCMCIA_CARD_ND(PROXIM, RANGELANDS_8430, 0), + PCMCIA_CARD_ND(SAMSUNG, SWL_2000N, 0), + PCMCIA_CARD_ND(SIMPLETECH, SPECTRUM24_ALT, 0), + PCMCIA_CARD_ND(SOCKET, LP_WLAN_CF, 0), + PCMCIA_CARD_ND(SYMBOL, LA4100, 0), + PCMCIA_CARD_ND(TDK, LAK_CD011WL, 0), { NULL } }; @@ -168,9 +168,12 @@ wi_pccard_match(dev) const struct pccard_product *pp; if ((pp = pccard_product_lookup(dev, wi_pccard_products, - sizeof(wi_pccard_products[0]), NULL)) != NULL) - return 0; - return ENXIO; + sizeof(wi_pccard_products[0]), NULL)) != NULL) { + if (pp->pp_name) + device_set_desc(dev, pp->pp_name); + return (0); + } + return (ENXIO); } #endif |