more microHAM devices

3 files changed, 49 insertions, 14 deletions

diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 905f2c99580..dabb9200fdf 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.27 2006/05/11 14:38:46 jason Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.28 2006/05/11 14:53:11 jason Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -143,9 +143,14 @@ USB_MATCH(uftdi)
 	    (uaa->product == USB_PRODUCT_FTDI_SERIAL_8U100AX ||
 	     uaa->product == USB_PRODUCT_FTDI_SERIAL_8U232AM ||
 	     uaa->product == USB_PRODUCT_FTDI_SEMC_DSS20 ||
+	     uaa->product == USB_PRODUCT_FTDI_MHAM_KW ||
+	     uaa->product == USB_PRODUCT_FTDI_MHAM_YS ||
 	     uaa->product == USB_PRODUCT_FTDI_MHAM_Y6 ||
 	     uaa->product == USB_PRODUCT_FTDI_MHAM_Y8 ||
-	     uaa->product == USB_PRODUCT_FTDI_MHAM_USBII ||
+	     uaa->product == USB_PRODUCT_FTDI_MHAM_IC ||
+	     uaa->product == USB_PRODUCT_FTDI_MHAM_DB9 ||
+	     uaa->product == USB_PRODUCT_FTDI_MHAM_RS232 ||
+	     uaa->product == USB_PRODUCT_FTDI_MHAM_Y9 ||
 	     uaa->product == USB_PRODUCT_FTDI_LCD_LK202_24 ||
 	     uaa->product == USB_PRODUCT_FTDI_LCD_LK204_24 ||
 	     uaa->product == USB_PRODUCT_FTDI_LCD_MX200 ||
@@ -236,9 +241,14 @@ USB_ATTACH(uftdi)
 		case USB_PRODUCT_FTDI_LCD_CFA_632:
 		case USB_PRODUCT_FTDI_LCD_CFA_633:
 		case USB_PRODUCT_FTDI_LCD_CFA_634:
+		case USB_PRODUCT_FTDI_MHAM_KW:
+		case USB_PRODUCT_FTDI_MHAM_YS:
 		case USB_PRODUCT_FTDI_MHAM_Y6:
 		case USB_PRODUCT_FTDI_MHAM_Y8:
-		case USB_PRODUCT_FTDI_MHAM_USBII:
+		case USB_PRODUCT_FTDI_MHAM_IC:
+		case USB_PRODUCT_FTDI_MHAM_DB9:
+		case USB_PRODUCT_FTDI_MHAM_RS232:
+		case USB_PRODUCT_FTDI_MHAM_Y9:
 		case USB_PRODUCT_SEALEVEL_USBSERIAL:
 			sc->sc_type = UFTDI_TYPE_8U232AM;
 			sc->sc_hdrlen = 0;
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 61ae66e6ebe..c6a745740eb 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.202 2006/05/11 14:37:55 jason Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.203 2006/05/11 14:53:11 jason Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.198 2006/05/11 14:37:04 jason Exp 
+ *	OpenBSD: usbdevs,v 1.199 2006/05/11 14:52:44 jason Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -983,9 +983,14 @@
 #define	USB_PRODUCT_FTDI_SERIAL_2232C	0x6010		/* 2232C Serial */
 #define	USB_PRODUCT_FTDI_PS2KBDMS	0x8371		/* PS/2 Keyboard/Mouse */
 #define	USB_PRODUCT_FTDI_SERIAL_8U100AX	0x8372		/* Serial */
-#define	USB_PRODUCT_FTDI_MHAM_Y6	0xeeea		/* microHAM Y6 */
-#define	USB_PRODUCT_FTDI_MHAM_Y8	0xeeeb		/* microHAM Y8 */
-#define	USB_PRODUCT_FTDI_MHAM_USBII	0xeeef		/* microHAM USB-II */
+#define	USB_PRODUCT_FTDI_MHAM_KW	0xeee8		/* KW */
+#define	USB_PRODUCT_FTDI_MHAM_YS	0xeee9		/* YS */
+#define	USB_PRODUCT_FTDI_MHAM_Y6	0xeeea		/* Y6 */
+#define	USB_PRODUCT_FTDI_MHAM_Y8	0xeeeb		/* Y8 */
+#define	USB_PRODUCT_FTDI_MHAM_IC	0xeeec		/* IC */
+#define	USB_PRODUCT_FTDI_MHAM_DB9	0xeeed		/* DB9 */
+#define	USB_PRODUCT_FTDI_MHAM_RS232	0xeeee		/* RS232 */
+#define	USB_PRODUCT_FTDI_MHAM_Y9	0xeeef		/* Y9 */
 #define	USB_PRODUCT_FTDI_LCD_MX200	0xfa01		/* Matrix Orbital MX200 Series LCD */
 #define	USB_PRODUCT_FTDI_LCD_LK202_24	0xfa03		/* Matrix Orbital LK202-24 LCD */
 #define	USB_PRODUCT_FTDI_LCD_LK204_24	0xfa04		/* Matrix Orbital LK204-24 LCD */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 1063551e944..2b43dc2cfe4 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.202 2006/05/11 14:37:55 jason Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.203 2006/05/11 14:53:11 jason Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.198 2006/05/11 14:37:04 jason Exp 
+ *	OpenBSD: usbdevs,v 1.199 2006/05/11 14:52:44 jason Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1259,16 +1259,36 @@ const struct usb_known_product usb_known_products[] = {
 	    "Serial",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_KW,
+	    "KW",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_YS,
+	    "YS",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y6,
-	    "microHAM Y6",
+	    "Y6",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y8,
-	    "microHAM Y8",
+	    "Y8",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_IC,
+	    "IC",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_DB9,
+	    "DB9",
+	},
+	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_RS232,
+	    "RS232",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_USBII,
-	    "microHAM USB-II",
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y9,
+	    "Y9",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_MX200,