diff options
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 19 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 32 |
2 files changed, 26 insertions, 25 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 8ddfa18462c..0cbc914b27f 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.564 2011/09/04 18:32:46 jsg Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.565 2011/09/16 13:05:20 yuo Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.554 2011/09/04 18:32:14 jsg Exp + * OpenBSD: usbdevs,v 1.555 2011/09/16 13:04:11 yuo Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -83,7 +83,7 @@ #define USB_VENDOR_CATC 0x0423 /* Computer Access Technology */ #define USB_VENDOR_SMC2 0x0424 /* Standard Microsystems */ #define USB_VENDOR_GRAVIS 0x0428 /* Advanced Gravis Computer */ -#define USB_VENDOR_SUN 0x0430 /* Sun Microsystems */ +#define USB_VENDOR_FUJITSUCOMP 0x0430 /* Fujitsu Component */ #define USB_VENDOR_TAUGA 0x0436 /* Taugagreining HF */ #define USB_VENDOR_AMD 0x0438 /* Advanced Micro Devices */ #define USB_VENDOR_LEXMARK 0x043d /* Lexmark International */ @@ -1788,6 +1788,13 @@ /* Fujitsu products */ #define USB_PRODUCT_FUJITSU_AH_F401U 0x105b /* AH-F401U Air H device */ +/* Fujitsu Component products */ +#define USB_PRODUCT_FUJITSUCOMP_KEYBOARD6 0x0005 /* Type 6 Keyboard */ +#define USB_PRODUCT_FUJITSUCOMP_KEYBOARD7 0x00a2 /* Type 7 Keyboard */ +/* XXX The above is a North American PC style keyboard possibly */ +#define USB_PRODUCT_FUJITSUCOMP_MOUSE 0x0100 /* Type 6 Mouse */ + + /* Fujitsu Siemens Computers products */ #define USB_PRODUCT_FSC_E5400 0x1009 /* PrismGT USB 2.0 WLAN */ @@ -3607,12 +3614,6 @@ #define USB_PRODUCT_SUNTAC_AS64LX 0x000b /* U-Cable type A3 */ #define USB_PRODUCT_SUNTAC_AS144L4 0x0011 /* U-Cable type A4 */ -/* Sun Microsystems products */ -#define USB_PRODUCT_SUN_KEYBOARD6 0x0005 /* Type 6 Keyboard */ -#define USB_PRODUCT_SUN_KEYBOARD7 0x00a2 /* Type 7 Keyboard */ -/* XXX The above is a North American PC style keyboard possibly */ -#define USB_PRODUCT_SUN_MOUSE 0x0100 /* Type 6 Mouse */ - /* System TALKS, Inc. */ #define USB_PRODUCT_SYSTEMTALKS_SGCX2UL 0x1920 /* SGC-X2UL */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 120b9193b93..4ca7fefcd03 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.558 2011/09/04 18:32:47 jsg Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.559 2011/09/16 13:05:20 yuo Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.554 2011/09/04 18:32:14 jsg Exp + * OpenBSD: usbdevs,v 1.555 2011/09/16 13:04:11 yuo Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -3514,6 +3514,18 @@ const struct usb_known_product usb_known_products[] = { "AH-F401U Air H device", }, { + USB_VENDOR_FUJITSUCOMP, USB_PRODUCT_FUJITSUCOMP_KEYBOARD6, + "Type 6 Keyboard", + }, + { + USB_VENDOR_FUJITSUCOMP, USB_PRODUCT_FUJITSUCOMP_KEYBOARD7, + "Type 7 Keyboard", + }, + { + USB_VENDOR_FUJITSUCOMP, USB_PRODUCT_FUJITSUCOMP_MOUSE, + "Type 6 Mouse", + }, + { USB_VENDOR_FSC, USB_PRODUCT_FSC_E5400, "PrismGT USB 2.0 WLAN", }, @@ -9026,18 +9038,6 @@ const struct usb_known_product usb_known_products[] = { "U-Cable type A4", }, { - USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD6, - "Type 6 Keyboard", - }, - { - USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD7, - "Type 7 Keyboard", - }, - { - USB_VENDOR_SUN, USB_PRODUCT_SUN_MOUSE, - "Type 6 Mouse", - }, - { USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL, "SGC-X2UL", }, @@ -9998,8 +9998,8 @@ const struct usb_known_vendor usb_known_vendors[] = { "Advanced Gravis Computer", }, { - USB_VENDOR_SUN, - "Sun Microsystems", + USB_VENDOR_FUJITSUCOMP, + "Fujitsu Component", }, { USB_VENDOR_TAUGA, |