From dc2b8f06e96370ecade877e650219155153b3d20 Mon Sep 17 00:00:00 2001 From: Damien Bergamini Date: Wed, 14 Apr 2010 20:20:44 +0000 Subject: clean Sitecom run(4) ids. use real product names, add some ids, remove some ids that never made it into production. --- sys/dev/usb/if_run.c | 22 ++++++++++----------- sys/dev/usb/usbdevs.h | 24 +++++++++++------------ sys/dev/usb/usbdevs_data.h | 48 +++++++++++++++++++--------------------------- 3 files changed, 41 insertions(+), 53 deletions(-) (limited to 'sys/dev/usb') diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index 135e30e2606..c7fbf2c38cd 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.66 2010/04/06 19:40:51 damien Exp $ */ +/* $OpenBSD: if_run.c,v 1.67 2010/04/14 20:20:43 damien Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini @@ -241,22 +241,20 @@ static const struct usb_devno run_devs[] = { USB_ID(SENAO, RT3072_3), USB_ID(SENAO, RT3072_4), USB_ID(SENAO, RT3072_5), - 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(SITECOMEU, RT3070_2), - USB_ID(SITECOMEU, RT3070_3), - USB_ID(SITECOMEU, RT3070_4), - USB_ID(SITECOMEU, RT3071), - USB_ID(SITECOMEU, RT3072_1), - USB_ID(SITECOMEU, RT3072_2), USB_ID(SITECOMEU, RT3072_3), USB_ID(SITECOMEU, RT3072_4), - USB_ID(SITECOMEU, RT3072_5), - USB_ID(SITECOMEU, RT3072_6), + USB_ID(SITECOMEU, WL302), + USB_ID(SITECOMEU, WL315), + USB_ID(SITECOMEU, WL321), + USB_ID(SITECOMEU, WL324), + USB_ID(SITECOMEU, WL329), + USB_ID(SITECOMEU, WL343), + USB_ID(SITECOMEU, WL344), + USB_ID(SITECOMEU, WL345), + USB_ID(SITECOMEU, WL349V4), USB_ID(SITECOMEU, WL608), USB_ID(SPARKLAN, RT2870_1), USB_ID(SPARKLAN, RT3070), diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 58bed0dfb74..9cf21495e8f 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.499 2010/04/14 20:01:07 damien Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.500 2010/04/14 20:20:43 damien Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.489 2010/04/14 19:59:09 damien Exp + * OpenBSD: usbdevs,v 1.490 2010/04/14 20:19:34 damien Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -3317,21 +3317,19 @@ #define USB_PRODUCT_SITECOMEU_WL168V4 0x0028 /* WL-168 v4 */ #define USB_PRODUCT_SITECOMEU_RT2870_2 0x002b /* RT2870 */ #define USB_PRODUCT_SITECOMEU_RT2870_3 0x002c /* RT2870 */ -#define USB_PRODUCT_SITECOMEU_RT2870_4 0x002d /* RT2870 */ +#define USB_PRODUCT_SITECOMEU_WL302 0x002d /* WL-302 */ #define USB_PRODUCT_SITECOMEU_WL603 0x0036 /* WL-603 */ -#define USB_PRODUCT_SITECOMEU_RT2770 0x0039 /* RT2770 */ -#define USB_PRODUCT_SITECOMEU_RT3070_2 0x003b /* RT3070 */ -#define USB_PRODUCT_SITECOMEU_RT3070_3 0x003c /* RT3070 */ -#define USB_PRODUCT_SITECOMEU_RT3070_4 0x003d /* RT3070 */ -#define USB_PRODUCT_SITECOMEU_RT3070 0x003e /* RT3070 */ +#define USB_PRODUCT_SITECOMEU_WL315 0x0039 /* WL-315 */ +#define USB_PRODUCT_SITECOMEU_WL321 0x003b /* WL-321 */ +#define USB_PRODUCT_SITECOMEU_WL324 0x003d /* WL-324 */ +#define USB_PRODUCT_SITECOMEU_WL343 0x003e /* WL-343 */ #define USB_PRODUCT_SITECOMEU_WL608 0x003f /* WL-608 */ -#define USB_PRODUCT_SITECOMEU_RT3071 0x0040 /* RT3071 */ -#define USB_PRODUCT_SITECOMEU_RT3072_1 0x0041 /* RT3072 */ -#define USB_PRODUCT_SITECOMEU_RT3072_2 0x0042 /* RT3072 */ +#define USB_PRODUCT_SITECOMEU_WL344 0x0040 /* WL-344 */ +#define USB_PRODUCT_SITECOMEU_WL329 0x0041 /* WL-329 */ +#define USB_PRODUCT_SITECOMEU_WL345 0x0042 /* WL-345 */ #define USB_PRODUCT_SITECOMEU_RT3072_3 0x0047 /* RT3072 */ #define USB_PRODUCT_SITECOMEU_RT3072_4 0x0048 /* RT3072 */ -#define USB_PRODUCT_SITECOMEU_RT3072_5 0x004a /* RT3072 */ -#define USB_PRODUCT_SITECOMEU_RT3072_6 0x004d /* RT3072 */ +#define USB_PRODUCT_SITECOMEU_WL349V4 0x0050 /* WL-349 v4 */ #define USB_PRODUCT_SITECOMEU_LN028 0x061c /* LN-028 */ #define USB_PRODUCT_SITECOMEU_LN030 0x0021 /* LN-030 */ #define USB_PRODUCT_SITECOMEU_WL113 0x9071 /* WL-113 */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 9be51472777..7aabde9a8da 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs_data.h,v 1.493 2010/04/14 20:01:07 damien Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.494 2010/04/14 20:20:43 damien Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.489 2010/04/14 19:59:09 damien Exp + * OpenBSD: usbdevs,v 1.490 2010/04/14 20:19:34 damien Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -8114,48 +8114,44 @@ const struct usb_known_product usb_known_products[] = { "RT2870", }, { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_4, - "RT2870", + USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL302, + "WL-302", }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL603, "WL-603", }, { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2770, - "RT2770", - }, - { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_2, - "RT3070", + USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL315, + "WL-315", }, { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_3, - "RT3070", + USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL321, + "WL-321", }, { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_4, - "RT3070", + USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL324, + "WL-324", }, { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070, - "RT3070", + USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL343, + "WL-343", }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL608, "WL-608", }, { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3071, - "RT3071", + USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL344, + "WL-344", }, { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_1, - "RT3072", + USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL329, + "WL-329", }, { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_2, - "RT3072", + USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL345, + "WL-345", }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_3, @@ -8166,12 +8162,8 @@ const struct usb_known_product usb_known_products[] = { "RT3072", }, { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_5, - "RT3072", - }, - { - USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_6, - "RT3072", + USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL349V4, + "WL-349 v4", }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN028, -- cgit v1.2.3