diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2008-07-21 19:41:45 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2008-07-21 19:41:45 +0000 |
| commit | 3e20fc1642273657d9d7748c84e0b929269d3cf5 (patch) | |
| tree | a3ff4f19e8437b111a18de37c2a3b04e806f267a /sys/dev/pci | |
| parent | 08430a2ddf7fd5201d4b1fbb8da645d3a9634bca (diff) | |
rename rt2860 pci ids to match with reality.
import some fixes for 1T2R adapters from the linux vendor driver.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_ral_pci.c | 28 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 14 |
2 files changed, 24 insertions, 18 deletions
diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c index c428f52c29d..e52e1a782f3 100644 --- a/sys/dev/pci/if_ral_pci.c +++ b/sys/dev/pci/if_ral_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral_pci.c,v 1.12 2007/12/09 00:08:35 deraadt Exp $ */ +/* $OpenBSD: if_ral_pci.c,v 1.13 2008/07/21 19:41:44 damien Exp $ */ /*- * Copyright (c) 2005-2007 @@ -104,14 +104,15 @@ struct cfattach ral_pci_ca = { }; const struct pci_matchid ral_pci_devices[] = { - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2560 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561S }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2661 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860_1 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860_1E }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860_2 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860_3 } + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2560 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561S }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2661 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2890 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2760 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2790 }, + { PCI_VENDOR_AWT, PCI_PRODUCT_AWT_RT2890 } }; int @@ -141,10 +142,11 @@ ral_pci_attach(struct device *parent, struct device *self, void *aux) case PCI_PRODUCT_RALINK_RT2661: psc->sc_opns = &ral_rt2661_opns; break; - case PCI_PRODUCT_RALINK_RT2860_1: - case PCI_PRODUCT_RALINK_RT2860_1E: - case PCI_PRODUCT_RALINK_RT2860_2: - case PCI_PRODUCT_RALINK_RT2860_3: + case PCI_PRODUCT_RALINK_RT2860: + case PCI_PRODUCT_RALINK_RT2890: + case PCI_PRODUCT_RALINK_RT2760: + case PCI_PRODUCT_RALINK_RT2790: + case PCI_PRODUCT_AWT_RT2890: psc->sc_opns = &ral_rt2860_opns; break; } diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 5677cf0939b..8d1592f3e5f 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.1387 2008/07/18 11:44:22 reyk Exp $ +$OpenBSD: pcidevs,v 1.1388 2008/07/21 19:41:44 damien Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -300,6 +300,7 @@ vendor ATTANSIC 0x1969 Attansic Technology vendor AGEIA 0x1971 Ageia vendor JMICRON 0x197b JMicron vendor ASPEED 0x1a03 ASPEED Technology +vendor AWT 0x1a3b AWT vendor SYMPHONY2 0x1c1c Symphony Labs vendor TEKRAM2 0x1de1 Tekram vendor TEHUTI 0x1fc9 Tehuti Networks @@ -1147,6 +1148,9 @@ product AVM FRITZ_CARD 0x0a00 Fritz ISDN product AVM FRITZ_PCI_V2_ISDN 0x0e00 Fritz v2.0 ISDN product AVM T1 0x1200 PRI T1 ISDN +/* AWT products */ +product AWT RT2890 0x1059 RT2890 + /* Belkin Components products */ product BELKIN2 F5D6001 0x6001 F5D6001 product BELKIN2 F5D6020V3 0x6020 F5D6020V3 @@ -3828,10 +3832,10 @@ product RALINK RT2560 0x0201 RT2560 product RALINK RT2561S 0x0301 RT2561S product RALINK RT2561 0x0302 RT2561 product RALINK RT2661 0x0401 RT2661 -product RALINK RT2860_1 0x0601 RT2860 -product RALINK RT2860_1E 0x0681 RT2860E -product RALINK RT2860_2 0x0701 RT2860 -product RALINK RT2860_3 0x0801 RT2860 +product RALINK RT2860 0x0601 RT2860 +product RALINK RT2890 0x0681 RT2890 +product RALINK RT2760 0x0701 RT2760 +product RALINK RT2790 0x0781 RT2790 /* Realtek products */ product REALTEK RT8029 0x8029 8029 |