From 5ec632a1e4e3ddb59bdedc708618f8fd700afb07 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 1 Jul 2004 05:14:12 +0000
Subject: [PATCH] Product and vendor ids for SIIG US2308 USB to Serial adaptor.

Tested against:	rwatson's laptop
---
 sys/dev/usb/uftdi.c | 56 +++++++++++++++++++++++++++++++--------------
 sys/dev/usb/usbdevs |  2 ++
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 2aeb70729165..8a511a6a53c1 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -165,6 +165,9 @@ USB_MATCH(uftdi)
 	     uaa->product == USB_PRODUCT_FTDI_LK202 ||
 	     uaa->product == USB_PRODUCT_FTDI_LK204))
 		return (UMATCH_VENDOR_PRODUCT);
+	if (uaa->vendor == USB_VENDOR_SIIG2 &&
+	    (uaa->product == USB_PRODUCT_SIIG2_US2308))
+		return (UMATCH_VENDOR_PRODUCT);
 
 	return (UMATCH_NONE);
 }
@@ -210,24 +213,43 @@ USB_ATTACH(uftdi)
 
 	id = usbd_get_interface_descriptor(iface);
 	ucom->sc_iface = iface;
-	switch( uaa->product ){
-	case USB_PRODUCT_FTDI_SERIAL_8U100AX:
-		sc->sc_type = UFTDI_TYPE_SIO;
-		sc->sc_hdrlen = 1;
+	switch( uaa->vendor ){
+	case USB_VENDOR_FTDI:
+		switch( uaa->product ){
+		case USB_PRODUCT_FTDI_SERIAL_8U100AX:
+			sc->sc_type = UFTDI_TYPE_SIO;
+			sc->sc_hdrlen = 1;
+			break;
+		case USB_PRODUCT_FTDI_SEMC_DSS20:
+		case USB_PRODUCT_FTDI_SERIAL_8U232AM:
+		case USB_PRODUCT_FTDI_CFA_631:
+		case USB_PRODUCT_FTDI_CFA_632:
+		case USB_PRODUCT_FTDI_CFA_633:
+		case USB_PRODUCT_FTDI_CFA_634:
+		case USB_PRODUCT_FTDI_USBSERIAL:
+		case USB_PRODUCT_FTDI_MX2_3:
+		case USB_PRODUCT_FTDI_MX4_5:
+		case USB_PRODUCT_FTDI_LK202:
+		case USB_PRODUCT_FTDI_LK204:
+			sc->sc_type = UFTDI_TYPE_8U232AM;
+			sc->sc_hdrlen = 0;
+			break;
+
+		default:		/* Can't happen */
+			goto bad;
+		}
 		break;
-	case USB_PRODUCT_FTDI_SEMC_DSS20:
-	case USB_PRODUCT_FTDI_SERIAL_8U232AM:
-	case USB_PRODUCT_FTDI_CFA_631:
-	case USB_PRODUCT_FTDI_CFA_632:
-	case USB_PRODUCT_FTDI_CFA_633:
-	case USB_PRODUCT_FTDI_CFA_634:
-	case USB_PRODUCT_FTDI_USBSERIAL:
-	case USB_PRODUCT_FTDI_MX2_3:
-	case USB_PRODUCT_FTDI_MX4_5:
-	case USB_PRODUCT_FTDI_LK202:
-	case USB_PRODUCT_FTDI_LK204:
-		sc->sc_type = UFTDI_TYPE_8U232AM;
-		sc->sc_hdrlen = 0;
+
+	case USB_VENDOR_SIIG2:
+		switch( uaa->product ){
+		case USB_PRODUCT_SIIG2_US2308:
+			sc->sc_type = UFTDI_TYPE_8U232AM;
+			sc->sc_hdrlen = 0;
+			break;
+
+		default:		/* Can't happen */
+			goto bad;
+		}
 		break;
 
 	default:		/* Can't happen */
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index ed7ee709f1c9..9b5ee2b02122 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -379,6 +379,7 @@ vendor VIDZMEDIA	0x3275	VidzMedia Pte Ltd
 vendor DAISY		0x3579	Daisy Technology
 vendor DELL		0x413c	Dell
 vendor INTEL		0x8086	Intel
+vendor SIIG2		0x0b39	SIIG
 vendor HP2		0xf003	Hewlett Packard
 
 /*
@@ -1192,6 +1193,7 @@ product SIGMATEL I_BEAD100	0x8008	i-Bead 100 MP3 Player
 
 /* SIIG products */
 product SIIG DIGIFILMREADER	0x0004	DigiFilm-Combo Reader
+product SIIG2 US2308		0x0421	USB to Serial
 
 /* Silicon Portals Inc. */
 product SILICONPORTALS YAPPH_NF	0x0200	YAP Phone (no firmware)