regen

2 files changed, 184 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 4e75856f2a4..010d1feb9ca 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.631 2014/01/07 14:06:51 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.632 2014/01/08 21:16:38 jcs Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.620 2014/01/07 14:06:48 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.621 2014/01/08 21:15:29 jcs Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -920,6 +920,42 @@
 #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_WELLSPRING_ANSI	0x0223		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING_ISO	0x0224		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING_JIS	0x0225		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING2_ANSI	0x0230		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING2_ISO	0x0231		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING2_JIS	0x0232		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING3_ANSI	0x0236		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING3_ISO	0x0237		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING3_JIS	0x0238		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING4_ANSI	0x023f		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING4_ISO	0x0240		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING4_JIS	0x0241		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING4A_ANSI	0x0242		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING4A_ISO	0x0243		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING4A_JIS	0x0244		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING5_ANSI	0x0245		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING5_ISO	0x0246		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING5_JIS	0x0247		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING6A_ANSI	0x0249		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING6A_ISO	0x024a		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING6A_JIS	0x024b		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING6_ANSI	0x024c		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING6_ISO	0x024d		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING6_JIS	0x024e		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING5A_ANSI	0x0252		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING5A_ISO	0x0253		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING5A_JIS	0x0254		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING7_ANSI	0x0262		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING7_ISO	0x0263		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING7_JIS	0x0264		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING7A_ANSI	0x0259		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING7A_ISO	0x025a		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING7A_JIS	0x025b		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING8_ANSI	0x0290		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING8_ISO	0x0291		/* Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING8_JIS	0x0292		/* Keyboard/Trackpad */
 #define	USB_PRODUCT_APPLE_OPTMOUSE	0x0302		/* Optical mouse */
 #define	USB_PRODUCT_APPLE_BLUETOOTH_HCI	0x1000		/* HID-proxy */
 #define	USB_PRODUCT_APPLE_SPEAKERS	0x1101		/* Speakers */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 3dd72a500a1..4960a7d235a 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.625 2014/01/07 14:06:51 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.626 2014/01/08 21:16:38 jcs Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.620 2014/01/07 14:06:48 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.621 2014/01/08 21:15:29 jcs Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -734,6 +734,150 @@ const struct usb_known_product usb_known_products[] = {
 	    "Keyboard/Trackpad",
 	},
 	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING2_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING2_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING2_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING3_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING3_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING3_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING4_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING4_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING4_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING4A_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING4A_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING4A_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING5_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING5_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING5_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING6A_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING6A_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING6A_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING6_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING6_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING6_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING5A_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING5A_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING5A_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING7_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING7_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING7_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING7A_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING7A_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING7A_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING8_ANSI,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING8_ISO,
+	    "Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING8_JIS,
+	    "Keyboard/Trackpad",
+	},
+	{
 	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_OPTMOUSE,
 	    "Optical mouse",
 	},