Messages in this thread Patch in this message | | | Date | Mon, 7 Aug 2006 14:44:15 +0100 (BST) | From | Jonathan Davies <> | Subject | Re: [PATCH] ftdi_sio driver - new PIDs |
| |
> 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 */
| |