regen

2 files changed, 52 insertions, 2 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 488bc7473af..36a8e1dd5e3 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs.h,v 1.576 2011/11/26 06:37:09 ckuethe Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.577 2011/12/01 22:49:51 dhill Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -888,6 +888,16 @@
 #define	USB_PRODUCT_APPLE_OPTMOUSE	0x0302		/* Optical mouse */
 #define	USB_PRODUCT_APPLE_ADB	0x1000		/* ADB device */
 #define	USB_PRODUCT_APPLE_SPEAKERS	0x1101		/* Speakers */
+#define	USB_PRODUCT_APPLE_IPHONE	0x1290		/* iPhone */
+#define	USB_PRODUCT_APPLE_IPOD_TOUCH	0x1291		/* iPod Touch */
+#define	USB_PRODUCT_APPLE_IPHONE_3G	0x1292		/* iPhone 3G */
+#define	USB_PRODUCT_APPLE_IPOD_TOUCH_2G	0x1293		/* iPod Touch 2G */
+#define	USB_PRODUCT_APPLE_IPHONE_3GS	0x1294		/* iPhone 3GS */
+#define	USB_PRODUCT_APPLE_IPHONE_4_GSM	0x1297		/* iPhone 4 GSM */
+#define	USB_PRODUCT_APPLE_IPOD_TOUCH_3G	0x1299		/* iPod Touch 3G */
+#define	USB_PRODUCT_APPLE_IPHONE_4_CDMA	0x129c		/* iPhone 4 CDMA */
+#define	USB_PRODUCT_APPLE_IPOD_TOUCH_4G	0x129e		/* iPod Touch 4G */
+#define	USB_PRODUCT_APPLE_IPHONE_4S	0x12a0		/* iPhone 4S */
 #define	USB_PRODUCT_APPLE_ETHERNET	0x1402		/* Ethernet A1277 */
 #define	USB_PRODUCT_APPLE_BLUETOOTH2	0x8205		/* Bluetooth */
 #define	USB_PRODUCT_APPLE_BLUETOOTH	0x8300		/* Bluetooth */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 6632e41e344..0f17df554ee 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.570 2011/11/26 06:37:09 ckuethe Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.571 2011/12/01 22:49:51 dhill Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -722,6 +722,46 @@ const struct usb_known_product usb_known_products[] = {
 	    "Speakers",
 	},
 	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE,
+	    "iPhone",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH,
+	    "iPod Touch",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G,
+	    "iPhone 3G",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_2G,
+	    "iPod Touch 2G",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3GS,
+	    "iPhone 3GS",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4_GSM,
+	    "iPhone 4 GSM",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_3G,
+	    "iPod Touch 3G",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4_CDMA,
+	    "iPhone 4 CDMA",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_4G,
+	    "iPod Touch 4G",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4S,
+	    "iPhone 4S",
+	},
+	{
 	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_ETHERNET,
 	    "Ethernet A1277",
 	},