Index: sys/conf/files =================================================================== RCS file: /cvsroot/src/sys/conf/files,v retrieving revision 1.924.4.1 diff -p -u -r1.924.4.1 files --- sys/conf/files 15 Mar 2009 19:43:48 -0000 1.924.4.1 +++ sys/conf/files 12 May 2009 21:07:57 -0000 @@ -608,6 +608,7 @@ file dev/ic/rtwphyio.c rtw device ral: arp, ether, ifnet, wlan, firmload file dev/ic/rt2560.c ral file dev/ic/rt2661.c ral +file dev/ic/rt2860.c ral # 3Com Etherlink-III Ethernet controller # Index: sys/dev/pci/if_ral_pci.c =================================================================== RCS file: /cvsroot/src/sys/dev/pci/if_ral_pci.c,v retrieving revision 1.9 diff -p -u -r1.9 if_ral_pci.c --- sys/dev/pci/if_ral_pci.c 29 Apr 2008 22:21:45 -0000 1.9 +++ sys/dev/pci/if_ral_pci.c 12 May 2009 21:07:57 -0000 @@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c #include #include +#include #include #include @@ -71,12 +72,18 @@ static struct ral_opns { rt2661_attach, rt2661_detach, rt2661_intr + +}, ral_rt2860_opns = { + rt2860_attach, + rt2860_detach, + rt2860_intr }; struct ral_pci_softc { union { struct rt2560_softc sc_rt2560; struct rt2661_softc sc_rt2661; + struct rt2860_softc sc_rt2860; } u; #define sc_sc u.sc_rt2560 @@ -109,11 +116,17 @@ ral_pci_match(struct device *parent, str case PCI_PRODUCT_RALINK_RT2561: case PCI_PRODUCT_RALINK_RT2561S: case PCI_PRODUCT_RALINK_RT2661: + case PCI_PRODUCT_RALINK_RT2760: + case PCI_PRODUCT_RALINK_RT2790: + case PCI_PRODUCT_RALINK_RT2860: + case PCI_PRODUCT_RALINK_RT2890: return 1; default: return 0; } - } + } else if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_AWT + && PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AWT_RT2890) + return 1; return 0; } @@ -135,8 +148,24 @@ ral_pci_attach(struct device *parent, st revision = PCI_REVISION(pa->pa_class); aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision); - psc->sc_opns = (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_RALINK_RT2560) ? - &ral_rt2560_opns : &ral_rt2661_opns; + switch(PCI_PRODUCT(pa->pa_id)) + { + case PCI_PRODUCT_RALINK_RT2560: + psc->sc_opns = &ral_rt2560_opns; + break; + case PCI_PRODUCT_RALINK_RT2561: + case PCI_PRODUCT_RALINK_RT2561S: + case PCI_PRODUCT_RALINK_RT2661: + psc->sc_opns = &ral_rt2661_opns; + break; + case PCI_PRODUCT_RALINK_RT2760: + case PCI_PRODUCT_RALINK_RT2790: + case PCI_PRODUCT_RALINK_RT2860: + case PCI_PRODUCT_RALINK_RT2890: + case PCI_PRODUCT_AWT_RT2890: + psc->sc_opns = &ral_rt2860_opns; + break; + } sc->sc_dmat = pa->pa_dmat; psc->sc_pc = pa->pa_pc; Index: sys/dev/pci/pcidevs =================================================================== RCS file: /cvsroot/src/sys/dev/pci/pcidevs,v retrieving revision 1.962.4.3 diff -p -u -r1.962.4.3 pcidevs --- sys/dev/pci/pcidevs 5 May 2009 18:17:57 -0000 1.962.4.3 +++ sys/dev/pci/pcidevs 12 May 2009 21:08:01 -0000 @@ -603,6 +603,7 @@ vendor LINKSYS2 0x17fe Linksys vendor RALINK 0x1814 Ralink Technologies vendor BBELEC 0x1896 B & B Electronics vendor ATTANSIC 0x1969 Attansic Technologies +vendor AWT 0x1a3b AWT vendor EVE 0x1adb EVE vendor SYMPHONY2 0x1c1c Symphony Labs (2nd PCI Vendor ID) vendor TEKRAM2 0x1de1 Tekram Technology (2nd PCI Vendor ID) @@ -1374,6 +1375,9 @@ product AVM FRITZ_PCI_V2_ISDN 0x0e00 Fri product AVM B1 0x0700 Basic Rate B1 ISDN Interface product AVM T1 0x1200 Primary Rate T1 ISDN Interface +/* AWT products */ +product AWT RT2890 0x1059 RT2890 + /* B & B Electronics Products */ product BBELEC NON_ISOLATED_1_PORT 0x4201 single-channel RS-485 PCI UART product BBELEC NON_ISOLATED_2_PORT 0x4202 dual-channel RS-485 PCI UART @@ -3427,6 +3431,10 @@ product RALINK RT2560 0x0201 RT2560 802 product RALINK RT2561S 0x0301 RT2561S 802.11b/g product RALINK RT2561 0x0302 RT2561 802.11b/g product RALINK RT2661 0x0401 RT2661 802.11b/g/n +product RALINK RT2760 0x0701 RT2760 802.11b/g/n +product RALINK RT2790 0x0781 RT2790 802.11b/g/n +product RALINK RT2860 0x0601 RT2860 802.11b/g/n +product RALINK RT2890 0x0681 RT2890 802.11b/g/n /* RATOC Systems products */ product RATOC REXPCI31 0x0853 REX PCI-31/33 SCSI Index: sys/dev/pci/pcidevs.h =================================================================== RCS file: /cvsroot/src/sys/dev/pci/pcidevs.h,v retrieving revision 1.963.4.3 diff -p -u -r1.963.4.3 pcidevs.h --- sys/dev/pci/pcidevs.h 5 May 2009 18:21:41 -0000 1.963.4.3 +++ sys/dev/pci/pcidevs.h 12 May 2009 21:08:07 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: pcidevs.h,v 1.963.4.3 2009/05/05 18:21:41 bouyer Exp $ */ +/* $NetBSD$ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -610,6 +610,7 @@ #define PCI_VENDOR_RALINK 0x1814 /* Ralink Technologies */ #define PCI_VENDOR_BBELEC 0x1896 /* B & B Electronics */ #define PCI_VENDOR_ATTANSIC 0x1969 /* Attansic Technologies */ +#define PCI_VENDOR_AWT 0x1a3b /* AWT */ #define PCI_VENDOR_EVE 0x1adb /* EVE */ #define PCI_VENDOR_SYMPHONY2 0x1c1c /* Symphony Labs (2nd PCI Vendor ID) */ #define PCI_VENDOR_TEKRAM2 0x1de1 /* Tekram Technology (2nd PCI Vendor ID) */ @@ -1381,6 +1382,9 @@ #define PCI_PRODUCT_AVM_B1 0x0700 /* Basic Rate B1 ISDN Interface */ #define PCI_PRODUCT_AVM_T1 0x1200 /* Primary Rate T1 ISDN Interface */ +/* AWT products */ +#define PCI_PRODUCT_AWT_RT2890 0x1059 /* RT2890 */ + /* B & B Electronics Products */ #define PCI_PRODUCT_BBELEC_NON_ISOLATED_1_PORT 0x4201 /* single-channel RS-485 PCI UART */ #define PCI_PRODUCT_BBELEC_NON_ISOLATED_2_PORT 0x4202 /* dual-channel RS-485 PCI UART */ @@ -3434,6 +3438,10 @@ #define PCI_PRODUCT_RALINK_RT2561S 0x0301 /* RT2561S 802.11b/g */ #define PCI_PRODUCT_RALINK_RT2561 0x0302 /* RT2561 802.11b/g */ #define PCI_PRODUCT_RALINK_RT2661 0x0401 /* RT2661 802.11b/g/n */ +#define PCI_PRODUCT_RALINK_RT2760 0x0701 /* RT2760 802.11b/g/n */ +#define PCI_PRODUCT_RALINK_RT2790 0x0781 /* RT2790 802.11b/g/n */ +#define PCI_PRODUCT_RALINK_RT2860 0x0601 /* RT2860 802.11b/g/n */ +#define PCI_PRODUCT_RALINK_RT2890 0x0681 /* RT2890 802.11b/g/n */ /* RATOC Systems products */ #define PCI_PRODUCT_RATOC_REXPCI31 0x0853 /* REX PCI-31/33 SCSI */ Index: sys/dev/pci/pcidevs_data.h =================================================================== RCS file: /cvsroot/src/sys/dev/pci/pcidevs_data.h,v retrieving revision 1.962.4.3 diff -p -u -r1.962.4.3 pcidevs_data.h --- sys/dev/pci/pcidevs_data.h 5 May 2009 18:21:41 -0000 1.962.4.3 +++ sys/dev/pci/pcidevs_data.h 12 May 2009 21:08:13 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: pcidevs_data.h,v 1.962.4.3 2009/05/05 18:21:41 bouyer Exp $ */ +/* $NetBSD$ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -2252,6 +2252,10 @@ static const struct pci_vendor pci_vendo "Attansic Technologies", }, { + PCI_VENDOR_AWT, + "AWT", + }, + { PCI_VENDOR_EVE, "EVE", }, @@ -2400,7 +2404,7 @@ static const struct pci_vendor pci_vendo "INVALID VENDOR ID", }, }; -const int pci_nvendors = 590; +const int pci_nvendors = 591; static const struct pci_product pci_products[] = { { @@ -5000,6 +5004,10 @@ static const struct pci_product pci_prod "Primary Rate T1 ISDN Interface", }, { + PCI_VENDOR_AWT, PCI_PRODUCT_AWT_RT2890, + "RT2890", + }, + { PCI_VENDOR_BBELEC, PCI_PRODUCT_BBELEC_NON_ISOLATED_1_PORT, "single-channel RS-485 PCI UART", }, @@ -12012,6 +12020,22 @@ static const struct pci_product pci_prod "RT2661 802.11b/g/n", }, { + PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2760, + "RT2760 802.11b/g/n", + }, + { + PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2790, + "RT2790 802.11b/g/n", + }, + { + PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860, + "RT2860 802.11b/g/n", + }, + { + PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2890, + "RT2890 802.11b/g/n", + }, + { PCI_VENDOR_RATOC, PCI_PRODUCT_RATOC_REXPCI31, "REX PCI-31/33 SCSI", }, @@ -14580,4 +14604,4 @@ static const struct pci_product pci_prod "Video Controller", }, }; -const int pci_nproducts = 3044; +const int pci_nproducts = 3049;