From 6e4e348282d890a37ee97b57338e297e349bd954 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@cvs.openbsd.org>
Date: Mon, 17 Jun 2002 16:25:08 +0000
Subject: sync

---
 sys/dev/usb/usbdevs.h      |  7 ++++---
 sys/dev/usb/usbdevs_data.h | 12 +++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 76f31364234..a52e05db94e 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.46 2002/06/10 01:23:02 nate Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.47 2002/06/17 16:25:07 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.44 2002/06/10 01:22:33 nate Exp 
+ *	OpenBSD: usbdevs,v 1.45 2002/06/17 16:24:41 nate Exp 
  */
 /* $NetBSD: usbdevs,v 1.240 2002/03/31 00:41:37 ichiro Exp $ */
 
@@ -656,7 +656,7 @@
 /* Future Technology Devices products */
 #define	USB_PRODUCT_FTDI_SERIAL_8U232AM	0x6001		/* 8U232AM Serial converter */
 #define	USB_PRODUCT_FTDI_PS2KBDMS	0x8371		/* PS/2 Keyboard/Mouse */
-#define	USB_PRODUCT_FTDI_SERIAL	0x8372		/* Serial converter */
+#define	USB_PRODUCT_FTDI_SERIAL_8U100AX	0x8372		/* Serial converter */
 
 /* Fuji photo products */
 #define	USB_PRODUCT_FUJIPHOTO_MASS0100	0x0100		/* Mass Storage */
@@ -1222,6 +1222,7 @@
 #define	USB_PRODUCT_DIAMOND2_SUPRA2890	0x0b4a		/* SupraMax 2890 56K */
 #define	USB_PRODUCT_DIAMOND2_RIO600USB	0x5001		/* Rio 600 */
 #define	USB_PRODUCT_DIAMOND2_RIO800USB	0x5002		/* Rio 800 USB */
+#define	USB_PRODUCT_DIAMOND2_PSAPLAY120	0x5003		/* Nike psa[play 120 */
 
 /* Tangtop products */
 #define	USB_PRODUCT_TANGTOP_USBPS2	0x0001		/* USBPS2 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 909bc594404..38edc5375a8 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.46 2002/06/10 01:23:02 nate Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.47 2002/06/17 16:25:07 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.44 2002/06/10 01:22:33 nate Exp 
+ *	OpenBSD: usbdevs,v 1.45 2002/06/17 16:24:41 nate Exp 
  */
 /* $NetBSD: usbdevs,v 1.240 2002/03/31 00:41:37 ichiro Exp $ */
 
@@ -1061,7 +1061,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "PS/2 Keyboard/Mouse",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL,
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX,
 	    0,
 	    "Future Technology Devices",
 	    "Serial converter",
@@ -3238,6 +3238,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Diamond (Supra)",
 	    "Rio 800 USB",
 	},
+	{
+	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_PSAPLAY120,
+	    0,
+	    "Diamond (Supra)",
+	    "Nike psa[play 120",
+	},
 	{
 	    USB_VENDOR_TANGTOP, USB_PRODUCT_TANGTOP_USBPS2,
 	    0,
-- 
cgit v1.2.3