diff options
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 10 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 24 |
2 files changed, 27 insertions, 7 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index c86a3b5112a..58e86ad58b5 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.579 2012/01/14 10:22:52 sthen Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.580 2012/01/29 11:00:22 mpi Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.569 2012/01/14 10:22:22 sthen Exp + * OpenBSD: usbdevs,v 1.570 2012/01/29 10:59:23 mpi Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -886,8 +886,12 @@ #define USB_PRODUCT_AOX_USB101 0x0008 /* Ethernet */ /* Apple Computer products */ +#define USB_PRODUCT_APPLE_FOUNTAIN_ANSI 0x020e /* Keyboard/Trackpad */ +#define USB_PRODUCT_APPLE_FOUNTAIN_ISO 0x020f /* Keyboard/Trackpad */ +#define USB_PRODUCT_APPLE_GEYSER_ANSI 0x0214 /* Keyboard/Trackpad */ +#define USB_PRODUCT_APPLE_GEYSER_ISO 0x0215 /* Keyboard/Trackpad */ #define USB_PRODUCT_APPLE_OPTMOUSE 0x0302 /* Optical mouse */ -#define USB_PRODUCT_APPLE_ADB 0x1000 /* ADB device */ +#define USB_PRODUCT_APPLE_BLUETOOTH_HCI 0x1000 /* HID-proxy */ #define USB_PRODUCT_APPLE_SPEAKERS 0x1101 /* Speakers */ #define USB_PRODUCT_APPLE_IPHONE 0x1290 /* iPhone */ #define USB_PRODUCT_APPLE_IPOD_TOUCH 0x1291 /* iPod Touch */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index a3a1fe94804..f0a265cb8af 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.573 2012/01/14 10:22:52 sthen Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.574 2012/01/29 11:00:22 mpi Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.569 2012/01/14 10:22:22 sthen Exp + * OpenBSD: usbdevs,v 1.570 2012/01/29 10:59:23 mpi Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -710,12 +710,28 @@ const struct usb_known_product usb_known_products[] = { "Ethernet", }, { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_FOUNTAIN_ANSI, + "Keyboard/Trackpad", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_FOUNTAIN_ISO, + "Keyboard/Trackpad", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER_ANSI, + "Keyboard/Trackpad", + }, + { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER_ISO, + "Keyboard/Trackpad", + }, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_OPTMOUSE, "Optical mouse", }, { - USB_VENDOR_APPLE, USB_PRODUCT_APPLE_ADB, - "ADB device", + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HCI, + "HID-proxy", }, { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_SPEAKERS, |