sync

2 files changed, 36 insertions, 36 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index cbfd3dcf3bf..23fe8a07f53 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.308 2007/10/10 01:36:23 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.309 2007/10/10 01:38:45 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.299 2007/10/10 01:36:16 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.300 2007/10/10 01:38:42 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -820,8 +820,8 @@
 /*product BELKIN F5U111		0x????	F5U111 Ethernet */
 #define	USB_PRODUCT_BELKIN2_F5U002	0x0002		/* F5U002 Parallel */
 #define	USB_PRODUCT_BELKIN_F5D6050	0x0050		/* F5D6050 802.11b Wireless adapter */
-#define	USB_PRODUCT_BELKIN_FBT001V	0x0081		/* FBT001v2 Bluetooth */
-#define	USB_PRODUCT_BELKIN_FBT003V	0x0084		/* FBT003v2 Bluetooth */
+#define	USB_PRODUCT_BELKIN_FBT001V	0x0081		/* Bluetooth */
+#define	USB_PRODUCT_BELKIN_FBT003V	0x0084		/* Bluetooth */
 #define	USB_PRODUCT_BELKIN_F5U103	0x0103		/* F5U103 Serial */
 #define	USB_PRODUCT_BELKIN_F5U109	0x0109		/* F5U109 Serial */
 #define	USB_PRODUCT_BELKIN_SCSI	0x0115		/* SCSI */
@@ -993,9 +993,9 @@
 
 /* Dell products */
 #define	USB_PRODUCT_DELL_AXIM	0x4005		/* Axim X51v */
-#define	USB_PRODUCT_DELL_BC02	0x8000		/* BC02 Bluetooth */
+#define	USB_PRODUCT_DELL_BC02	0x8000		/* Bluetooth */
 #define	USB_PRODUCT_DELL_TM1180	0x8100		/* TrueMobile 1180 WLAN */
-#define	USB_PRODUCT_DELL_BLUETOOTH350	0x8103		/* Bluetooth 350 */
+#define	USB_PRODUCT_DELL_BLUETOOTH350	0x8103		/* Bluetooth */
 #define	USB_PRODUCT_DELL_W5500	0x8115		/* W5500 HSDPA */
 
 /* DeLorme products */
@@ -1147,7 +1147,7 @@
 #define	USB_PRODUCT_FTDI_SERIAL_2232L	0xcff8		/* 2232L Serial */
 #define	USB_PRODUCT_FTDI_PS2KBDMS	0x8371		/* PS/2 Keyboard/Mouse */
 #define	USB_PRODUCT_FTDI_SERIAL_8U100AX	0x8372		/* Serial */
-#define	USB_PRODUCT_FTDI_MJS_SIRIUS_PC	0xca81		/* MJS Sirius To PC Interface */
+#define	USB_PRODUCT_FTDI_MJS_SIRIUS_PC	0xca81		/* MJS Sirius To PC */
 #define	USB_PRODUCT_FTDI_SERIAL_232BM	0xee18		/* FT232BM Serial */
 #define	USB_PRODUCT_FTDI_MHAM_KW	0xeee8		/* KW */
 #define	USB_PRODUCT_FTDI_MHAM_YS	0xeee9		/* YS */
@@ -1563,7 +1563,7 @@
 /* MCT Corp. */
 #define	USB_PRODUCT_MCT_HUB0100	0x0100		/* Hub */
 #define	USB_PRODUCT_MCT_DU_H3SP_USB232	0x0200		/* D-Link DU-H3SP BAY Hub */
-#define	USB_PRODUCT_MCT_USB232	0x0210		/* RS232 Interface */
+#define	USB_PRODUCT_MCT_USB232	0x0210		/* RS232 */
 #define	USB_PRODUCT_MCT_SITECOM_USB232	0x0230		/* Sitecom RS232 */
 #define	USB_PRODUCT_MCT_ML_4500	0x0302		/* ML-4500 */
 
@@ -1606,7 +1606,7 @@
 #define	USB_PRODUCT_MSI_RT2573_2	0x6877		/* RT2573 */
 #define	USB_PRODUCT_MSI_RT2573_3	0xa861		/* RT2573 */
 #define	USB_PRODUCT_MSI_RT2573_4	0xa874		/* RT2573 */
-#define	USB_PRODUCT_MSI_BLUETOOTH_2	0xa970		/* Bluetooth2 */
+#define	USB_PRODUCT_MSI_BLUETOOTH_2	0xa970		/* Bluetooth */
 
 /* Micronet Communications products */
 #define	USB_PRODUCT_MICRONET_SP128AR	0x0003		/* SP128AR EtherFast */
@@ -1796,10 +1796,10 @@
 #define	USB_PRODUCT_ONSPEC2_8IN2	0xb012		/* 8In2 */
 
 /* OQO */
-#define	USB_PRODUCT_OQO_WIFI01	0x0002		/* model 01 WiFi interface */
-#define	USB_PRODUCT_OQO_BT01	0x0003		/* model 01 Bluetooth interface */
+#define	USB_PRODUCT_OQO_WIFI01	0x0002		/* model 01 WiFi */
+#define	USB_PRODUCT_OQO_BT01	0x0003		/* model 01 Bluetooth */
 #define	USB_PRODUCT_OQO_ETHER01PLUS	0x7720		/* model 01+ Ethernet */
-#define	USB_PRODUCT_OQO_ETHER01	0x8150		/* model 01 Ethernet interface */
+#define	USB_PRODUCT_OQO_ETHER01	0x8150		/* model 01 Ethernet */
 
 /* Ours Technology Inc. */
 #define	USB_PRODUCT_OTI_SOLID	0x6803		/* Solid state disk */
@@ -1911,14 +1911,14 @@
 #define	USB_PRODUCT_PRIMAX_PCGAUMS1	0x4d04		/* Sony PCGA-UMS1 */
 
 /* Prolific products */
-#define	USB_PRODUCT_PROLIFIC_PL2301	0x0000		/* PL2301 Host-Host interface */
-#define	USB_PRODUCT_PROLIFIC_PL2302	0x0001		/* PL2302 Host-Host interface */
+#define	USB_PRODUCT_PROLIFIC_PL2301	0x0000		/* PL2301 Host-Host */
+#define	USB_PRODUCT_PROLIFIC_PL2302	0x0001		/* PL2302 Host-Host */
 #define	USB_PRODUCT_PROLIFIC_RSAQ2	0x04bb		/* PL2303 Serial */
 #define	USB_PRODUCT_PROLIFIC_PL2303	0x2303		/* PL2303 Serial */
 #define	USB_PRODUCT_PROLIFIC2_PL2303	0x2303		/* PL2303 Serial */
 #define	USB_PRODUCT_PROLIFIC_PL2305	0x2305		/* Parallel printer */
 #define	USB_PRODUCT_PROLIFIC_ATAPI4	0x2307		/* ATAPI-4 Bridge Controller */
-#define	USB_PRODUCT_PROLIFIC_PL2501	0x2501		/* PL2501 Host-Host interface */
+#define	USB_PRODUCT_PROLIFIC_PL2501	0x2501		/* PL2501 Host-Host */
 #define	USB_PRODUCT_PROLIFIC_PL2303X	0xaaa0		/* PL2303 Serial */
 #define	USB_PRODUCT_PROLIFIC_PL2303X2	0xaaa2		/* PL2303 Serial */
 
@@ -2158,15 +2158,15 @@
 #define	USB_PRODUCT_SONY_DRIVEV2	0x002b		/* Harddrive V2 */
 #define	USB_PRODUCT_SONY_MSACUS1	0x002d		/* Memorystick MSAC-US1 */
 #define	USB_PRODUCT_SONY_HANDYCAM	0x002e		/* Handycam */
-#define	USB_PRODUCT_SONY_MSC	0x0032		/* Sony MSC Memorystick Slot */
+#define	USB_PRODUCT_SONY_MSC	0x0032		/* Sony MSC Memorystick */
 #define	USB_PRODUCT_SONY_CLIE_35	0x0038		/* Clie v3.5 */
 #define	USB_PRODUCT_SONY_PS2KEYBOARD	0x005c		/* PlayStation2 keyboard */
 #define	USB_PRODUCT_SONY_PS2KEYBOARDHUB	0x005d		/* PlayStation2 keyboard hub */
 #define	USB_PRODUCT_SONY_PS2MOUSE	0x0061		/* PlayStation2 mouse */
 #define	USB_PRODUCT_SONY_CLIE_40	0x0066		/* Clie v4.0 */
-#define	USB_PRODUCT_SONY_CLIE_40_MS	0x006d		/* Clie v4.0 Memory Stick slot */
+#define	USB_PRODUCT_SONY_CLIE_40_MS	0x006d		/* Clie v4.0 Memory Stick */
 #define	USB_PRODUCT_SONY_CLIE_S360	0x0095		/* Sony Clie s360 */
-#define	USB_PRODUCT_SONY_CLIE_41_MS	0x0099		/* Clie v4.1 Memory Stick slot */
+#define	USB_PRODUCT_SONY_CLIE_41_MS	0x0099		/* Clie v4.1 Memory Stick */
 #define	USB_PRODUCT_SONY_CLIE_41	0x009a		/* Clie v4.1 */
 #define	USB_PRODUCT_SONY_CLIE_NX60	0x00da		/* Sony Clie nx60 */
 #define	USB_PRODUCT_SONY_CLIE_TJ25	0x0169		/* Sony Clie tj25 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 14dcb075890..d8e1933575f 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.305 2007/10/10 01:36:23 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.306 2007/10/10 01:38:45 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.299 2007/10/10 01:36:16 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.300 2007/10/10 01:38:42 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -742,11 +742,11 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_FBT001V,
-	    "FBT001v2 Bluetooth",
+	    "Bluetooth",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_FBT003V,
-	    "FBT003v2 Bluetooth",
+	    "Bluetooth",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U103,
@@ -1194,7 +1194,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_DELL, USB_PRODUCT_DELL_BC02,
-	    "BC02 Bluetooth",
+	    "Bluetooth",
 	},
 	{
 	    USB_VENDOR_DELL, USB_PRODUCT_DELL_TM1180,
@@ -1202,7 +1202,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_DELL, USB_PRODUCT_DELL_BLUETOOTH350,
-	    "Bluetooth 350",
+	    "Bluetooth",
 	},
 	{
 	    USB_VENDOR_DELL, USB_PRODUCT_DELL_W5500,
@@ -1606,7 +1606,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MJS_SIRIUS_PC,
-	    "MJS Sirius To PC Interface",
+	    "MJS Sirius To PC",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232BM,
@@ -2750,7 +2750,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232,
-	    "RS232 Interface",
+	    "RS232",
 	},
 	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_SITECOM_USB232,
@@ -2882,7 +2882,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_BLUETOOTH_2,
-	    "Bluetooth2",
+	    "Bluetooth",
 	},
 	{
 	    USB_VENDOR_MICRONET, USB_PRODUCT_MICRONET_SP128AR,
@@ -3370,11 +3370,11 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_OQO, USB_PRODUCT_OQO_WIFI01,
-	    "model 01 WiFi interface",
+	    "model 01 WiFi",
 	},
 	{
 	    USB_VENDOR_OQO, USB_PRODUCT_OQO_BT01,
-	    "model 01 Bluetooth interface",
+	    "model 01 Bluetooth",
 	},
 	{
 	    USB_VENDOR_OQO, USB_PRODUCT_OQO_ETHER01PLUS,
@@ -3382,7 +3382,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_OQO, USB_PRODUCT_OQO_ETHER01,
-	    "model 01 Ethernet interface",
+	    "model 01 Ethernet",
 	},
 	{
 	    USB_VENDOR_OTI, USB_PRODUCT_OTI_SOLID,
@@ -3686,11 +3686,11 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2301,
-	    "PL2301 Host-Host interface",
+	    "PL2301 Host-Host",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2302,
-	    "PL2302 Host-Host interface",
+	    "PL2302 Host-Host",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2,
@@ -3714,7 +3714,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2501,
-	    "PL2501 Host-Host interface",
+	    "PL2501 Host-Host",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X,
@@ -4322,7 +4322,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC,
-	    "Sony MSC Memorystick Slot",
+	    "Sony MSC Memorystick",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_35,
@@ -4346,7 +4346,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40_MS,
-	    "Clie v4.0 Memory Stick slot",
+	    "Clie v4.0 Memory Stick",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_S360,
@@ -4354,7 +4354,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41_MS,
-	    "Clie v4.1 Memory Stick slot",
+	    "Clie v4.1 Memory Stick",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41,