summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2004-11-06 03:05:21 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2004-11-06 03:05:21 +0000
commit1ff06900efce7db363a50d918e7dec4008601c1c (patch)
tree202e68742b873c0a726c70332267c1186cbacd3f /sys/dev/ic
parentc99901e2eccd669c1b5e6bac194625383a5ecee8 (diff)
sync pci ids
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/ar5xxx.c33
1 files changed, 19 insertions, 14 deletions
diff --git a/sys/dev/ic/ar5xxx.c b/sys/dev/ic/ar5xxx.c
index 13337399494..70878465164 100644
--- a/sys/dev/ic/ar5xxx.c
+++ b/sys/dev/ic/ar5xxx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5xxx.c,v 1.3 2004/11/03 16:40:46 reyk Exp $ */
+/* $OpenBSD: ar5xxx.c,v 1.4 2004/11/06 03:05:20 reyk Exp $ */
/*
* Copyright (c) 2004 Reyk Floeter <reyk@vantronix.net>.
@@ -50,35 +50,40 @@ ieee80211_regchannel ar5k_2ghz_channels[] = IEEE80211_CHANNELS_2GHZ;
static const struct {
u_int16_t vendor;
u_int16_t device;
- const char * name;
ar5k_attach_t (*attach);
} ar5k_known_products[] = {
/*
* From pcidevs_data.h
*/
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5210,
- "AR5210 Wireless LAN", ar5k_ar5210_attach },
+ ar5k_ar5210_attach },
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5210_AP,
- "AR5210 Wireless LAN (AP11)", ar5k_ar5210_attach },
+ ar5k_ar5210_attach },
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5210_DEFAULT,
- "AR5210 Wireless LAN (no eeprom)", ar5k_ar5210_attach },
+ ar5k_ar5210_attach },
#ifdef notyet
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5211,
- "AR5211 Wireless LAN", ar5k_ar5211_attach },
+ ar5k_ar5211_attach },
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5211_DEFAULT,
- "AR5211 Wireless LAN (no eeprom)", ar5k_ar5211_attach },
+ ar5k_ar5211_attach },
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5311,
- "AR5211 Wireless LAN", ar5k_ar5211_attach },
+ ar5k_ar5211_attach },
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5211_FPGA11B,
- "AR5211 Wireless LAN Reference Card", ar5k_ar5211_attach },
+ ar5k_ar5211_attach },
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5211_LEGACY,
- "AR5211 Wireless LAN Reference Card", ar5k_ar5211_attach },
+ ar5k_ar5211_attach },
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5212,
- "AR5212 Wireless LAN", ar5k_ar5212_attach },
+ ar5k_ar5212_attach },
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5212_DEFAULT,
- "AR5212 Wireless LAN (no eeprom)", ar5k_ar5212_attach },
+ ar5k_ar5212_attach },
{ PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5212_FPGA,
- "AR5212 Wireless LAN Reference Card", ar5k_ar5212_attach },
+ ar5k_ar5212_attach },
+ { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5212_IBM,
+ ar5k_ar5212_attach },
+ { PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CRDAG675,
+ ar5k_ar5212_attach },
+ { PCI_VENDOR_3COM2, PCI_PRODUCT_3COM2_3CRPAG175,
+ ar5k_ar5212_attach },
#endif
};
@@ -98,7 +103,7 @@ ath_hal_probe(vendor, device)
for (i = 0; i < AR5K_ELEMENTS(ar5k_known_products); i++) {
if (vendor == ar5k_known_products[i].vendor &&
device == ar5k_known_products[i].device)
- return (ar5k_known_products[i].name);
+ return ("");
}
return (NULL);