summaryrefslogtreecommitdiff
path: root/sys/dev/usb/if_run.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/if_run.c')
-rw-r--r--sys/dev/usb/if_run.c155
1 files changed, 73 insertions, 82 deletions
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 7f1d51cb3c5..264b0664763 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_run.c,v 1.20 2009/05/11 20:42:09 damien Exp $ */
+/* $OpenBSD: if_run.c,v 1.21 2009/05/12 17:32:09 damien Exp $ */
/*-
* Copyright (c) 2008,2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -78,115 +78,106 @@ int run_debug = 0;
#define DPRINTFN(n, x)
#endif
-/*
- * PLEASE keep this list sorted as is; this is to ease the sync with the
- * Ralink Linux driver. If you want to add new entries, add them at the
- * end of the list.
- */
#define USB_ID(v, p) { USB_VENDOR_##v, USB_PRODUCT_##v##_##p }
static const struct usb_devno run_devs[] = {
- /* Entries from the Ralink Linux driver. */
- /* AUTOMATICALLY GENERATED, DO NOT EDIT BY HAND. */
- USB_ID(RALINK, RT2770),
- USB_ID(RALINK, RT2870),
- USB_ID(RALINK, RT3070),
- USB_ID(RALINK, RT3071),
- USB_ID(RALINK, RT3072),
- USB_ID(ABOCOM, RT2870),
USB_ID(ABOCOM, RT2770),
- USB_ID(ASUS, RT2870_1),
- USB_ID(ASUS, RT2870_2),
- USB_ID(ASUS, RT2870_3),
- USB_ID(SITECOMEU, RT2870_1),
- USB_ID(SITECOMEU, RT2870_2),
- USB_ID(SITECOMEU, RT2870_3),
- USB_ID(SITECOMEU, RT3070),
- USB_ID(SITECOMEU, RT2870_4),
- USB_ID(SITECOMEU, RT2770),
- USB_ID(CONCEPTRONIC2, RT2870_1),
- USB_ID(CONCEPTRONIC2, RT2870_6),
- USB_ID(PLANEX2, RT2870),
- USB_ID(PLANEX2, RT3070),
- USB_ID(DLINK2, RT2870_1),
- USB_ID(DLINK2, RT2870_2),
- USB_ID(DLINK, RT2870),
- USB_ID(DLINK, RT3072),
- USB_ID(CONCEPTRONIC2, RT2870_2),
- USB_ID(CONCEPTRONIC2, RT2870_8),
- USB_ID(BELKIN, RT2870_1),
- USB_ID(CONCEPTRONIC2, RT2870_3),
- USB_ID(CONCEPTRONIC2, RT2870_5),
- USB_ID(COREGA, RT2870_1),
- USB_ID(COREGA, RT2870_2),
- USB_ID(COREGA, RT2870_3),
- USB_ID(AMIT, RT2870_1),
- USB_ID(GIGABYTE, RT2870_1),
- USB_ID(GIGABYTE, GNWB32L),
- USB_ID(SPARKLAN, RT2870_1),
+ USB_ID(ABOCOM, RT2870),
+ USB_ID(ABOCOM, RT3070),
+ USB_ID(ABOCOM, RT3071),
+ USB_ID(ABOCOM, RT3072),
+ USB_ID(ABOCOM2, RT2870_1),
+ USB_ID(ACCTON, RT2770),
USB_ID(ACCTON, RT2870_1),
+ USB_ID(ACCTON, RT2870_2),
+ USB_ID(ACCTON, RT2870_3),
USB_ID(ACCTON, RT2870_4),
USB_ID(ACCTON, RT2870_5),
- USB_ID(ACCTON, RT2770),
- USB_ID(ACCTON, RT2870_3),
USB_ID(ACCTON, RT3070),
- USB_ID(ZCOM, RT2870_1),
- USB_ID(ZYXEL, RT2870_1),
- USB_ID(ZCOM, RT2870_2),
- USB_ID(SENAO, RT2870_1),
- USB_ID(SENAO, RT2870_2),
- USB_ID(SENAO, RT3070),
- USB_ID(SENAO, RT3071),
- USB_ID(SENAO, RT3072),
- USB_ID(PHILIPS, RT2870),
- USB_ID(CONCEPTRONIC2, RT2870_4),
- USB_ID(AZUREWAVE, RT2870_1),
- USB_ID(AZUREWAVE, RT3070),
- USB_ID(ACCTON, RT2870_2),
- USB_ID(AMIT2, RT2870),
- USB_ID(HAWKING, RT2870_1),
- USB_ID(HAWKING, RT2870_2),
- USB_ID(CYBERTAN, RT2870),
- USB_ID(UMEDIA, RT2870_1),
- USB_ID(BELKIN, RT2870_2),
- USB_ID(ABOCOM2, RT2870_1),
- USB_ID(CONCEPTRONIC2, RT2870_7),
- USB_ID(SAMSUNG2, RT2870_1),
- USB_ID(ABOCOM, RT3070),
- USB_ID(ABOCOM, RT3071),
- USB_ID(ABOCOM, RT3072),
- USB_ID(EDIMAX, RT2870_1),
- USB_ID(ZINWELL, RT2870_1),
- USB_ID(ZINWELL, RT2870_2),
- USB_ID(QUANTA, RT3070),
- USB_ID(LOGITEC, RT2870_1),
- USB_ID(LOGITEC, RT2870_2),
- USB_ID(LOGITEC, RT2870_3),
USB_ID(AIRTIES, RT3070),
- USB_ID(DLINK2, RT3072),
- USB_ID(PEGATRON, RT3070),
-
- /* Entries not in the Ralink Linux driver. */
USB_ID(AMIT, CGWLUSB2GNR),
+ USB_ID(AMIT, RT2870_1),
+ USB_ID(AMIT2, RT2870),
+ USB_ID(ASUS, RT2870_1),
+ USB_ID(ASUS, RT2870_2),
+ USB_ID(ASUS, RT2870_3),
USB_ID(ASUS2, USBN11),
+ USB_ID(AZUREWAVE, RT2870_1),
+ USB_ID(AZUREWAVE, RT3070),
USB_ID(BELKIN, F5D8053V3),
USB_ID(BELKIN, F5D8055),
USB_ID(BELKIN, F6D4050V1),
+ USB_ID(BELKIN, RT2870_1),
+ USB_ID(BELKIN, RT2870_2),
+ USB_ID(CONCEPTRONIC2, RT2870_1),
+ USB_ID(CONCEPTRONIC2, RT2870_2),
+ USB_ID(CONCEPTRONIC2, RT2870_3),
+ USB_ID(CONCEPTRONIC2, RT2870_4),
+ USB_ID(CONCEPTRONIC2, RT2870_5),
+ USB_ID(CONCEPTRONIC2, RT2870_6),
+ USB_ID(CONCEPTRONIC2, RT2870_7),
+ USB_ID(CONCEPTRONIC2, RT2870_8),
USB_ID(CONCEPTRONIC2, VIGORN61),
USB_ID(COREGA, CGWLUSB300GNM),
+ USB_ID(COREGA, RT2870_1),
+ USB_ID(COREGA, RT2870_2),
+ USB_ID(COREGA, RT2870_3),
+ USB_ID(CYBERTAN, RT2870),
+ USB_ID(DLINK, RT2870),
+ USB_ID(DLINK, RT3072),
USB_ID(DLINK2, DWA130),
+ USB_ID(DLINK2, RT2870_1),
+ USB_ID(DLINK2, RT2870_2),
+ USB_ID(DLINK2, RT3072),
USB_ID(EDIMAX, EW7717),
USB_ID(EDIMAX, EW7718),
+ USB_ID(EDIMAX, RT2870_1),
USB_ID(GIGABYTE, GNWB31N),
+ USB_ID(GIGABYTE, GNWB32L),
+ USB_ID(GIGABYTE, RT2870_1),
USB_ID(HAWKING, HWUN2),
+ USB_ID(HAWKING, RT2870_1),
+ USB_ID(HAWKING, RT2870_2),
USB_ID(LINKSYS4, WUSB100),
USB_ID(LINKSYS4, WUSB600N),
+ USB_ID(LOGITEC, RT2870_1),
+ USB_ID(LOGITEC, RT2870_2),
+ USB_ID(LOGITEC, RT2870_3),
USB_ID(MELCO, WLIUCAG300N),
USB_ID(MELCO, WLIUCG300N),
USB_ID(MELCO, WLIUCGN),
+ USB_ID(PEGATRON, RT3070),
+ USB_ID(PHILIPS, RT2870),
USB_ID(PLANEX2, GWUS300MINIS),
USB_ID(PLANEX2, GWUSMICRON),
+ USB_ID(PLANEX2, RT2870),
+ USB_ID(PLANEX2, RT3070),
+ USB_ID(QUANTA, RT3070),
+ USB_ID(RALINK, RT2770),
+ USB_ID(RALINK, RT2870),
+ USB_ID(RALINK, RT3070),
+ USB_ID(RALINK, RT3071),
+ USB_ID(RALINK, RT3072),
+ USB_ID(SAMSUNG2, RT2870_1),
+ USB_ID(SENAO, RT2870_1),
+ USB_ID(SENAO, RT2870_2),
+ USB_ID(SENAO, RT3070),
+ USB_ID(SENAO, RT3071),
+ USB_ID(SENAO, RT3072),
+ USB_ID(SITECOMEU, RT2770),
+ USB_ID(SITECOMEU, RT2870_1),
+ USB_ID(SITECOMEU, RT2870_2),
+ USB_ID(SITECOMEU, RT2870_3),
+ USB_ID(SITECOMEU, RT2870_4),
+ USB_ID(SITECOMEU, RT3070),
+ USB_ID(SPARKLAN, RT2870_1),
USB_ID(SWEEX2, LW303),
- USB_ID(SWEEX2, LW313)
+ USB_ID(SWEEX2, LW313),
+ USB_ID(UMEDIA, RT2870_1),
+ USB_ID(ZCOM, RT2870_1),
+ USB_ID(ZCOM, RT2870_2),
+ USB_ID(ZINWELL, RT2870_1),
+ USB_ID(ZINWELL, RT2870_2),
+ USB_ID(ZYXEL, RT2870_1)
};
int run_match(struct device *, void *, void *);