[PATCH] small FTDI USB serial driver update -- attempt #2

[PATCH] small FTDI USB serial driver update -- attempt #2

[dranch]

Resending via Mutt due to various issues cited by Greg Kroah-Hartman on my 
first attempt via Thunderbird2.


Reason for patch:
-----------------
This patch is to add a US Interface, Inc. "Navigator" USB device.
Specifically, it's a HAM Radio USB sound modem that also
incorporates three pairs of unique FTDI serial ports.  The standard
Linux FTDI serial driver will only recognize the first two serial
ports of an unknown FDTI derived device and this patch adds in
recognition to these specific new IDs.

Diffs are against a vanilla 2.6.34

Signed-off-by: David A. Ranch <dranch@trinnet.net>



--- linux-2.6.34/drivers/usb/serial/ftdi_sio_ids.h.orig 2010-07-25 07:17:44.000000000 -0700
+++ linux-2.6.34/drivers/usb/serial/ftdi_sio_ids.h      2010-07-25 07:20:46.000000000 -0700
@@ -40,6 +40,13 @@

 #define FTDI_NXTCAM_PID                0xABB8 /* NXTCam for Mindstorms NXT */

+/* US Interface Navigator (http://www.usinterface.com/). */
+/* Submitted by David Ranch */
+#define FTDI_USINT_CAT_PID     0xB810  /* Navigator CAT and 2nd PTT lines */
+#define FTDI_USINT_WKEY_PID    0xB811  /* Navigator WKEY and FSK lines */
+#define FTDI_USINT_RS232_PID   0xB812  /* Navigator RS232 and CONFIG lines */
+
+
 /* OOCDlink by Joern Kaipf <joernk@web.de>
  * (http://www.joernonline.de/dw/doku.php?id=start&idx=projects:oocdlink) */
 #define FTDI_OOCDLINK_PID      0xbaf8  /* Amontec JTAGkey */



--- linux-2.6.34/drivers/usb/serial/ftdi_sio.c.orig     2010-07-25 07:21:10.000000000 -0700
+++ linux-2.6.34/drivers/usb/serial/ftdi_sio.c  2010-07-25 07:24:21.000000000 -0700
@@ -162,6 +162,9 @@ static struct usb_device_id id_table_com
        { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_5_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_6_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_7_PID) },
+       { USB_DEVICE(FTDI_VID, FTDI_USINT_CAT_PID) },
+       { USB_DEVICE(FTDI_VID, FTDI_USINT_WKEY_PID) },
+       { USB_DEVICE(FTDI_VID, FTDI_USINT_RS232_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_ACTZWAVE_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID)