diff options
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 17 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 44 |
2 files changed, 37 insertions, 24 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index b2b089c765b..39cabcbcf3e 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.634 2014/01/22 02:47:05 sasano Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.635 2014/02/15 02:17:47 jsg Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.622 2014/01/22 01:25:41 sasano Exp + * OpenBSD: usbdevs,v 1.623 2014/02/15 02:16:57 jsg Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -57,7 +57,7 @@ * make the device recognised by the appropriate device driver. */ -#define USB_VENDOR_UNKNOWN1 0x0053 /* Unknown vendor */ +#define USB_VENDOR_PLANEX4 0x0053 /* Planex Communications */ #define USB_VENDOR_UNKNOWN2 0x0105 /* Unknown vendor */ #define USB_VENDOR_EGALAX2 0x0123 /* eGalax */ #define USB_VENDOR_UNKNOWN6 0x01e1 /* Unknown vendor */ @@ -3291,6 +3291,8 @@ #define USB_PRODUCT_PLANEX_GW_US11H 0x14ea /* GW-US11H WLAN */ #define USB_PRODUCT_PLANEX2_GW_US11S 0x3220 /* GW-US11S WLAN */ #define USB_PRODUCT_PLANEX2_RTL8188CU_3 0x4902 /* RTL8188CU */ +#define USB_PRODUCT_PLANEX4_GWUS54ZGL 0x5301 /* GW-US54ZGL */ +#define USB_PRODUCT_PLANEX4_ZD1211B 0x5302 /* ZD1211B */ #define USB_PRODUCT_PLANEX2_GW_US54GXS 0x5303 /* GW-US54GXS WLAN */ #define USB_PRODUCT_PLANEX2_GW_US300 0x5304 /* GW-US300 */ #define USB_PRODUCT_PLANEX2_GWUS54HP 0xab01 /* GW-US54HP */ @@ -4131,10 +4133,6 @@ /* Universal Access products */ #define USB_PRODUCT_UNIACCESS_PANACHE 0x0101 /* Panache Surf ISDN */ -/* Unknown vendor 1 */ -#define USB_PRODUCT_UNKNOWN1_ZD1211B_1 0x5301 /* ZD1211B */ -#define USB_PRODUCT_UNKNOWN1_ZD1211B_2 0x5301 /* ZD1211B */ - /* Unknown vendor 2 */ #define USB_PRODUCT_UNKNOWN2_ZD1211B 0x0105 /* ZD1211B */ #define USB_PRODUCT_UNKNOWN2_NW3100 0x145f /* NW-3100 */ @@ -4327,13 +4325,16 @@ /* ZyXEL Communication Co. products */ #define USB_PRODUCT_ZYXEL_OMNI56K 0x1500 /* Omni 56K Plus */ #define USB_PRODUCT_ZYXEL_980N 0x2011 /* Scorpion-980N */ +#define USB_PRODUCT_ZYXEL_G220 0x3401 /* G-220 */ +#define USB_PRODUCT_ZYXEL_G220F 0x3402 /* G-220F */ #define USB_PRODUCT_ZYXEL_G200V2 0x3407 /* G-200 v2 */ -#define USB_PRODUCT_ZYXEL_ZYAIRG220 0x3401 /* ZyAIR G-220 */ #define USB_PRODUCT_ZYXEL_AG225H 0x3409 /* AG-225H */ #define USB_PRODUCT_ZYXEL_M202 0x340a /* M-202 */ #define USB_PRODUCT_ZYXEL_G270S 0x340c /* G-270S */ #define USB_PRODUCT_ZYXEL_G220V2 0x340f /* G-220 v2 */ #define USB_PRODUCT_ZYXEL_G202 0x3410 /* G-202 */ +#define USB_PRODUCT_ZYXEL_AG220 0x3412 /* AG-220 */ +#define USB_PRODUCT_ZYXEL_AG225HV2 0x3413 /* AG-225H v2 */ #define USB_PRODUCT_ZYXEL_RT2573 0x3415 /* RT2573 */ #define USB_PRODUCT_ZYXEL_RT2870_1 0x3416 /* RT2870 */ #define USB_PRODUCT_ZYXEL_NWD271N 0x3417 /* NWD-271N */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index c37ee23fccf..f9b6f3cb5cb 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.628 2014/01/22 02:47:05 sasano Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.629 2014/02/15 02:17:47 jsg Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.622 2014/01/22 01:25:41 sasano Exp + * OpenBSD: usbdevs,v 1.623 2014/02/15 02:16:57 jsg Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -8038,6 +8038,14 @@ const struct usb_known_product usb_known_products[] = { "RTL8188CU", }, { + USB_VENDOR_PLANEX4, USB_PRODUCT_PLANEX4_GWUS54ZGL, + "GW-US54ZGL", + }, + { + USB_VENDOR_PLANEX4, USB_PRODUCT_PLANEX4_ZD1211B, + "ZD1211B", + }, + { USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW_US54GXS, "GW-US54GXS WLAN", }, @@ -10482,14 +10490,6 @@ const struct usb_known_product usb_known_products[] = { "Panache Surf ISDN", }, { - USB_VENDOR_UNKNOWN1, USB_PRODUCT_UNKNOWN1_ZD1211B_1, - "ZD1211B", - }, - { - USB_VENDOR_UNKNOWN1, USB_PRODUCT_UNKNOWN1_ZD1211B_2, - "ZD1211B", - }, - { USB_VENDOR_UNKNOWN2, USB_PRODUCT_UNKNOWN2_ZD1211B, "ZD1211B", }, @@ -10974,12 +10974,16 @@ const struct usb_known_product usb_known_products[] = { "Scorpion-980N", }, { - USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G200V2, - "G-200 v2", + USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G220, + "G-220", + }, + { + USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G220F, + "G-220F", }, { - USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_ZYAIRG220, - "ZyAIR G-220", + USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G200V2, + "G-200 v2", }, { USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_AG225H, @@ -11002,6 +11006,14 @@ const struct usb_known_product usb_known_products[] = { "G-202", }, { + USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_AG220, + "AG-220", + }, + { + USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_AG225HV2, + "AG-225H v2", + }, + { USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RT2573, "RT2573", }, @@ -11042,8 +11054,8 @@ const struct usb_known_product usb_known_products[] = { const struct usb_known_vendor usb_known_vendors[] = { { - USB_VENDOR_UNKNOWN1, - "Unknown vendor", + USB_VENDOR_PLANEX4, + "Planex Communications", }, { USB_VENDOR_UNKNOWN2, |