[PATCH] ftdi_sio driver - new PIDs

[PATCH] ftdi_sio driver - new PIDs

[Jonathan Davies]

Hello,

I have come across some USB Serial FTDI-based devices which are not automatically detected by ftdi_sio, as of Linux 2.6.17, because their Product IDs are not recognised by the driver.

The devices are:

1. AlphaMicro Components AMC-232USB01 (serial to USB converter cable)
   - http://www.alphamicro.net/components/product~line~4~id~224.asp
   - vendor ID 0x0403
   - product ID 0xff00

2. Lawicel CANUSB (CAN bus to USB converter dongle)
   - http://www.canusb.com/
   - vendor ID 0x0403
   - product ID 0xffa8

Below is the patch for drivers/usb/serial/ftdi_sio.{c,h} against Linux 2.6.17 which includes these Product IDs.

Signed-off-by: Jonathan Davies <jjd27@cam.ac.uk>


diff -uprN -X dontdiff linux-vanilla/drivers/usb/serial/ftdi_sio.c linux-2.6.17/drivers/usb/serial/ftdi_sio.c
--- linux-vanilla/drivers/usb/serial/ftdi_sio.c 2006-08-04 15:12:02.000000000 +0100
+++ linux-2.6.17/drivers/usb/serial/ftdi_sio.c  2006-08-04 15:07:43.000000000 +0100
@@ -17,6 +17,9 @@
   * See http://ftdi-usb-sio.sourceforge.net for upto date testing info
   * and extra documentation
   *
+ * (04/Aug/2006) Jonathan Davies
+ *      Added PIDs for AMC232 and Lawicel CANUSB.
+ *
   * (21/Jul/2004) Ian Abbott
   *      Incorporated Steven Turner's code to add support for the FT2232C chip.
   *      The prelimilary port to the 2.6 kernel was by Rus V. Brushkoff.  I have
@@ -307,6 +310,8 @@ static struct ftdi_sio_quirk ftdi_HE_TIR


  static struct usb_device_id id_table_combined [] = {
+   { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
+   { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
     { USB_DEVICE(FTDI_VID, FTDI_ACTZWAVE_PID) },
     { USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) },
     { USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) },
diff -uprN -X dontdiff linux-vanilla/drivers/usb/serial/ftdi_sio.h linux-2.6.17/drivers/usb/serial/ftdi_sio.h
--- linux-vanilla/drivers/usb/serial/ftdi_sio.h 2006-08-04 15:12:02.000000000 +0100
+++ linux-2.6.17/drivers/usb/serial/ftdi_sio.h  2006-08-04 15:08:39.000000000 +0100
@@ -31,6 +31,8 @@
  #define FTDI_NF_RIC_VID    0x0DCD  /* Vendor Id */
  #define FTDI_NF_RIC_PID    0x0001  /* Product Id */

+#define FTDI_CANUSB_PID 0xFFA8 /* Lawicel CANUSB Product Id */
+#define FTDI_AMC232_PID 0xFF00 /* AlphaMicro Components AMC-232USB01 Product Id */

  /* ACT Solutions HomePro ZWave interface (http://www.act-solutions.com/HomePro.htm) */
  #define FTDI_ACTZWAVE_PID  0xF2D0

Re: [PATCH] ftdi_sio driver - new PIDs

[Greg KH]

On Fri, Aug 04, 2006 at 03:34:25PM +0100, Jonathan Davies wrote:
> Hello,
> 
> I have come across some USB Serial FTDI-based devices which are not 
> automatically detected by ftdi_sio, as of Linux 2.6.17, because their 
> Product IDs are not recognised by the driver.
> 
> The devices are:
> 
> 1. AlphaMicro Components AMC-232USB01 (serial to USB converter cable)
>   - http://www.alphamicro.net/components/product~line~4~id~224.asp
>   - vendor ID 0x0403
>   - product ID 0xff00
> 
> 2. Lawicel CANUSB (CAN bus to USB converter dongle)
>   - http://www.canusb.com/
>   - vendor ID 0x0403
>   - product ID 0xffa8
> 
> Below is the patch for drivers/usb/serial/ftdi_sio.{c,h} against Linux 
> 2.6.17 which includes these Product IDs.
> 
> Signed-off-by: Jonathan Davies <jjd27@cam.ac.uk>
> 
> 
> diff -uprN -X dontdiff linux-vanilla/drivers/usb/serial/ftdi_sio.c 
> linux-2.6.17/drivers/usb/serial/ftdi_sio.c
> --- linux-vanilla/drivers/usb/serial/ftdi_sio.c 2006-08-04 
> 15:12:02.000000000 +0100
> +++ linux-2.6.17/drivers/usb/serial/ftdi_sio.c  2006-08-04 
> 15:07:43.000000000 +0100

Your patch is line-wrapped and the tabs are eaten, making it hard to
apply the patch :(

Also, can you make this against the 2.6.18-rc3 kernel, as there are a
lot of new ids already added for this device and this patch conflicts
with it a bit.

> @@ -17,6 +17,9 @@
>   * See http://ftdi-usb-sio.sourceforge.net for upto date testing info
>   * and extra documentation
>   *
> + * (04/Aug/2006) Jonathan Davies
> + *      Added PIDs for AMC232 and Lawicel CANUSB.
> + *

This section isn't needed anymore, the git changelog is all that is
used now.

thanks,

greg k-h

Re: [PATCH] ftdi_sio driver - new PIDs

[Jonathan Davies]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1967 bytes --]


> Your patch is line-wrapped and the tabs are eaten, making it hard to
> apply the patch :(

Sorry; I'll try again with a different mail client!

> Also, can you make this against the 2.6.18-rc3 kernel, as there are a
> lot of new ids already added for this device and this patch conflicts
> with it a bit.

Done. The new patch is below. Hopefully this one is an improvement...

Signed-off-by: Jonathan Davies <jjd27@cam.ac.uk>

diff -uprN -X linux-2.6.18-rc3-vanilla/Documentation/dontdiff linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.c linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.c
--- linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.c	2006-07-30 07:15:36.000000000 +0100
+++ linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.c	2006-08-07 11:33:15.000000000 +0100
@@ -306,6 +306,8 @@ static struct ftdi_sio_quirk ftdi_HE_TIR


  static struct usb_device_id id_table_combined [] = {
+	{ USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
+	{ USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
  	{ USB_DEVICE(FTDI_VID, FTDI_ACTZWAVE_PID) },
  	{ USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) },
  	{ USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) },
diff -uprN -X linux-2.6.18-rc3-vanilla/Documentation/dontdiff linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.h linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.h
--- linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.h	2006-07-30 07:15:36.000000000 +0100
+++ linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.h	2006-08-07 11:32:25.000000000 +0100
@@ -35,6 +35,11 @@
  /* ACT Solutions HomePro ZWave interface (http://www.act-solutions.com/HomePro.htm) */
  #define FTDI_ACTZWAVE_PID	0xF2D0

+/* www.canusb.com/ Lawicel CANUSB device */
+#define FTDI_CANUSB_PID 0xFFA8 /* Product Id */
+
+/* AlphaMicro Components AMC-232USB01 device */
+#define FTDI_AMC232_PID 0xFF00 /* Product Id */

  /* www.starting-point-systems.com µChameleon device */
  #define FTDI_MICRO_CHAMELEON_PID	0xCAA0	/* Product Id */

Re: [PATCH] ftdi_sio driver - new PIDs

[Greg KH]

On Mon, Aug 07, 2006 at 02:44:15PM +0100, Jonathan Davies wrote:
> 
> >Your patch is line-wrapped and the tabs are eaten, making it hard to
> >apply the patch :(
>
> Sorry; I'll try again with a different mail client!

Closer, the tabs are now fine, but the patch is line-wrapped, and you
are using a mime email, which means I can't directly apply the patch...

Care to try again, third time's the charm :)

thanks,

greg k-h

Re: [PATCH] ftdi_sio driver - new PIDs

[Jonathan Davies]

Greg KH wrote:
> On Mon, Aug 07, 2006 at 02:44:15PM +0100, Jonathan Davies wrote:
>>> Your patch is line-wrapped and the tabs are eaten, making it hard to
>>> apply the patch :(
>> Sorry; I'll try again with a different mail client!
> 
> Closer, the tabs are now fine, but the patch is line-wrapped, and you
> are using a mime email, which means I can't directly apply the patch...

Time to try a third mail client.

> Care to try again, third time's the charm :)

Here we go again:

Signed-off-by: Jonathan Davies <jjd27@cam.ac.uk>

diff -uprN -X linux-2.6.18-rc3-vanilla/Documentation/dontdiff linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.c linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.c
--- linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.c	2006-07-30 07:15:36.000000000 +0100
+++ linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.c	2006-08-07 11:33:15.000000000 +0100
@@ -306,6 +306,8 @@ static struct ftdi_sio_quirk ftdi_HE_TIR
 
 
 static struct usb_device_id id_table_combined [] = {
+	{ USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
+	{ USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_ACTZWAVE_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) },
diff -uprN -X linux-2.6.18-rc3-vanilla/Documentation/dontdiff linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.h linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.h
--- linux-2.6.18-rc3-vanilla/drivers/usb/serial/ftdi_sio.h	2006-07-30 07:15:36.000000000 +0100
+++ linux-2.6.18-rc3/drivers/usb/serial/ftdi_sio.h	2006-08-09 10:34:50.000000000 +0100
@@ -32,6 +32,12 @@
 #define FTDI_NF_RIC_PID	0x0001	/* Product Id */
 
 
+/* www.canusb.com Lawicel CANUSB device */
+#define FTDI_CANUSB_PID 0xFFA8 /* Product Id */
+
+/* AlphaMicro Components AMC-232USB01 device */
+#define FTDI_AMC232_PID 0xFF00 /* Product Id */
+
 /* ACT Solutions HomePro ZWave interface (http://www.act-solutions.com/HomePro.htm) */
 #define FTDI_ACTZWAVE_PID	0xF2D0