Module Name: src
Committed By: phx
Date: Tue Nov 30 11:28:44 UTC 2010
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.561 -r1.562 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.562 -r1.563 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.561 src/sys/dev/usb/usbdevs.h:1.562
--- src/sys/dev/usb/usbdevs.h:1.561 Thu Nov 25 14:16:55 2010
+++ src/sys/dev/usb/usbdevs.h Tue Nov 30 11:28:44 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.561 2010/11/25 14:16:55 sborrill Exp $ */
+/* $NetBSD: usbdevs.h,v 1.562 2010/11/30 11:28:44 phx Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.568 2010/11/25 14:16:24 sborrill Exp
+ * NetBSD: usbdevs,v 1.569 2010/11/30 11:25:25 phx Exp
*/
/*
@@ -762,9 +762,29 @@
/* Apple Computer products */
#define USB_PRODUCT_APPLE_EXT_KBD 0x020c /* Apple Extended USB Keyboard */
+#define USB_PRODUCT_APPLE_FOUNTAIN_ANSI 0x020e /* Apple Internal Keyboard/Trackpad (Fountain/ANSI) */
+#define USB_PRODUCT_APPLE_FOUNTAIN_ISO 0x020f /* Apple Internal Keyboard/Trackpad (Fountain/ISO) */
+#define USB_PRODUCT_APPLE_GEYSER_ANSI 0x0214 /* Apple Internal Keyboard/Trackpad (Geyser/ANSI) */
+#define USB_PRODUCT_APPLE_GEYSER_ISO 0x0215 /* Apple Internal Keyboard/Trackpad (Geyser/ISO) */
+#define USB_PRODUCT_APPLE_GEYSER_JIS 0x0216 /* Apple Internal Keyboard/Trackpad (Geyser/JIS) */
+#define USB_PRODUCT_APPLE_GEYSER3_ANSI 0x0217 /* Apple Internal Keyboard/Trackpad (Geyser3/ANSI) */
+#define USB_PRODUCT_APPLE_GEYSER3_ISO 0x0218 /* Apple Internal Keyboard/Trackpad (Geyser3/ISO) */
+#define USB_PRODUCT_APPLE_GEYSER3_JIS 0x0219 /* Apple Internal Keyboard/Trackpad (Geyser3/JIS) */
+#define USB_PRODUCT_APPLE_GEYSER4_ANSI 0x021a /* Apple Internal Keyboard/Trackpad (Geyser4/ANSI) */
+#define USB_PRODUCT_APPLE_GEYSER4_ISO 0x021b /* Apple Internal Keyboard/Trackpad (Geyser4/ISO) */
+#define USB_PRODUCT_APPLE_GEYSER4_JIS 0x021c /* Apple Internal Keyboard/Trackpad (Geyser4/JIS) */
+#define USB_PRODUCT_APPLE_WELLSPRING_ANSI 0x0223 /* Apple Internal Keyboard/Trackpad (Wellspring/ANSI) */
+#define USB_PRODUCT_APPLE_WELLSPRING_ISO 0x0224 /* Apple Internal Keyboard/Trackpad (Wellspring/ISO) */
+#define USB_PRODUCT_APPLE_WELLSPRING_JIS 0x0225 /* Apple Internal Keyboard/Trackpad (Wellspring/JIS) */
+#define USB_PRODUCT_APPLE_WELLSPRING2_ANSI 0x0230 /* Apple Internal Keyboard/Trackpad (Wellspring2/ANSI) */
+#define USB_PRODUCT_APPLE_WELLSPRING2_ISO 0x0231 /* Apple Internal Keyboard/Trackpad (Wellspring2/ISO) */
+#define USB_PRODUCT_APPLE_WELLSPRING2_JIS 0x0232 /* Apple Internal Keyboard/Trackpad (Wellspring2/JIS) */
#define USB_PRODUCT_APPLE_OPTMOUSE 0x0302 /* Optical mouse */
#define USB_PRODUCT_APPLE_MIGHTYMOUSE 0x0304 /* Mighty Mouse */
+#define USB_PRODUCT_APPLE_FOUNTAIN_TP 0x030a /* Apple Internal Trackpad (Fountain) */
+#define USB_PRODUCT_APPLE_GEYSER1_TP 0x030b /* Apple Internal Trackpad (Geyser) */
#define USB_PRODUCT_APPLE_MAGICMOUSE 0x030d /* Magic Mouse */
+#define USB_PRODUCT_APPLE_ADB 0x1000 /* Internal ADB device */
#define USB_PRODUCT_APPLE_EXT_KBD_HUB 0x1003 /* Hub in Apple Extended USB Keyboard */
#define USB_PRODUCT_APPLE_SPEAKERS 0x1101 /* Speakers */
#define USB_PRODUCT_APPLE_IPHONE 0x1290 /* iPhone */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.562 src/sys/dev/usb/usbdevs_data.h:1.563
--- src/sys/dev/usb/usbdevs_data.h:1.562 Thu Nov 25 14:16:55 2010
+++ src/sys/dev/usb/usbdevs_data.h Tue Nov 30 11:28:44 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.562 2010/11/25 14:16:55 sborrill Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.563 2010/11/30 11:28:44 phx Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.568 2010/11/25 14:16:24 sborrill Exp
+ * NetBSD: usbdevs,v 1.569 2010/11/30 11:25:25 phx Exp
*/
/*
@@ -2527,6 +2527,74 @@
"Apple Extended USB Keyboard",
},
{
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_FOUNTAIN_ANSI,
+ "Apple Internal Keyboard/Trackpad (Fountain/ANSI)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_FOUNTAIN_ISO,
+ "Apple Internal Keyboard/Trackpad (Fountain/ISO)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER_ANSI,
+ "Apple Internal Keyboard/Trackpad (Geyser/ANSI)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER_ISO,
+ "Apple Internal Keyboard/Trackpad (Geyser/ISO)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER_JIS,
+ "Apple Internal Keyboard/Trackpad (Geyser/JIS)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER3_ANSI,
+ "Apple Internal Keyboard/Trackpad (Geyser3/ANSI)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER3_ISO,
+ "Apple Internal Keyboard/Trackpad (Geyser3/ISO)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER3_JIS,
+ "Apple Internal Keyboard/Trackpad (Geyser3/JIS)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER4_ANSI,
+ "Apple Internal Keyboard/Trackpad (Geyser4/ANSI)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER4_ISO,
+ "Apple Internal Keyboard/Trackpad (Geyser4/ISO)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER4_JIS,
+ "Apple Internal Keyboard/Trackpad (Geyser4/JIS)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING_ANSI,
+ "Apple Internal Keyboard/Trackpad (Wellspring/ANSI)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING_ISO,
+ "Apple Internal Keyboard/Trackpad (Wellspring/ISO)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING_JIS,
+ "Apple Internal Keyboard/Trackpad (Wellspring/JIS)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING2_ANSI,
+ "Apple Internal Keyboard/Trackpad (Wellspring2/ANSI)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING2_ISO,
+ "Apple Internal Keyboard/Trackpad (Wellspring2/ISO)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING2_JIS,
+ "Apple Internal Keyboard/Trackpad (Wellspring2/JIS)",
+ },
+ {
USB_VENDOR_APPLE, USB_PRODUCT_APPLE_OPTMOUSE,
"Optical mouse",
},
@@ -2535,10 +2603,22 @@
"Mighty Mouse",
},
{
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_FOUNTAIN_TP,
+ "Apple Internal Trackpad (Fountain)",
+ },
+ {
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_GEYSER1_TP,
+ "Apple Internal Trackpad (Geyser)",
+ },
+ {
USB_VENDOR_APPLE, USB_PRODUCT_APPLE_MAGICMOUSE,
"Magic Mouse",
},
{
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_ADB,
+ "Internal ADB device",
+ },
+ {
USB_VENDOR_APPLE, USB_PRODUCT_APPLE_EXT_KBD_HUB,
"Hub in Apple Extended USB Keyboard",
},
@@ -8295,4 +8375,4 @@
"Prestige",
},
};
-const int usb_nproducts = 1574;
+const int usb_nproducts = 1594;
