sync to new ufdti; Mark Peoples

3 files changed, 14 insertions, 8 deletions

diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 57449270097..003b8f4482a 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.61 2011/10/20 16:37:36 mpf Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.62 2011/10/28 01:45:55 deraadt Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -302,7 +302,8 @@ static const struct usb_devno uftdi_devs[] = {
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y8 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y9 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_YS },
-	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MJS_SIRIUS_PC },
+	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MJS_SIRIUS_PC_1 },
+	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MJS_SIRIUS_PC_2 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_NXTCAM },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OCEANIC },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OOCDLINK },
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 3fd0c43a9f1..f084ee6bb45 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.570 2011/10/20 16:37:03 mpf Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.571 2011/10/28 01:45:54 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.560 2011/10/20 16:35:52 mpf Exp 
+ *	OpenBSD: usbdevs,v 1.561 2011/10/28 01:45:36 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1585,6 +1585,7 @@
 #define	USB_PRODUCT_FTDI_FT4232H	0x6011		/* FT4232H */
 #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_2	0x9379		/* MJS Sirius To PC Interface */
 #define	USB_PRODUCT_FTDI_OPENRD	0x9e90		/* OpenRD JTAGKey */
 #define	USB_PRODUCT_FTDI_CANDAPTER	0x9f80		/* CANdapter */
 #define	USB_PRODUCT_FTDI_NXTCAM	0xabb8		/* Mindstorms NXTCam */
@@ -1606,7 +1607,7 @@
 #define	USB_PRODUCT_FTDI_ASK_RDR4X7_6	0xc995		/* ASK RDR 4X7 */
 #define	USB_PRODUCT_FTDI_ASK_RDR4X7_7	0xc996		/* ASK RDR 4X7 */
 #define	USB_PRODUCT_FTDI_ASK_RDR4X7_8	0xc997		/* ASK RDR 4X7 */
-#define	USB_PRODUCT_FTDI_MJS_SIRIUS_PC	0xca81		/* MJS Sirius To PC Interface */
+#define	USB_PRODUCT_FTDI_MJS_SIRIUS_PC_1	0xca81		/* MJS Sirius To PC Interface */
 #define	USB_PRODUCT_FTDI_CHAMELEON	0xcaa0		/* µChameleon */
 #define	USB_PRODUCT_FTDI_OPENPORT_13M	0xcc48		/* OpenPort 1.3 Mitsubishi */
 #define	USB_PRODUCT_FTDI_OPENPORT_13S	0xcc49		/* OpenPort 1.3 Subaru */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index d63a84c89e8..6cf75f1fcd2 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.564 2011/10/20 16:37:03 mpf Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.565 2011/10/28 01:45:55 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.560 2011/10/20 16:35:52 mpf Exp 
+ *	OpenBSD: usbdevs,v 1.561 2011/10/28 01:45:36 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -2710,6 +2710,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Serial",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MJS_SIRIUS_PC_2,
+	    "MJS Sirius To PC Interface",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OPENRD,
 	    "OpenRD JTAGKey",
 	},
@@ -2794,7 +2798,7 @@ const struct usb_known_product usb_known_products[] = {
 	    "ASK RDR 4X7",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MJS_SIRIUS_PC,
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MJS_SIRIUS_PC_1,
 	    "MJS Sirius To PC Interface",
 	},
 	{