diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2006-01-09 12:11:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-31 20:23:36 -0500 |
commit | a94b52ac84828e193d18c96c1334c9997b524a35 (patch) | |
tree | 868599cb962d29b2aa07fcf895dbcbbf85c80c94 /drivers/usb/serial | |
parent | 641adaaee18aacc4f4ba77850c2257373f1736d1 (diff) |
[PATCH] USB: ftdi_sio: new IDs for Westrex devices
This patch adds two new devices to the ftdi_sio driver's device ID
table. The device IDs were supplied by Cory Lee to support two POS
printers made by Westrex International (Model 777 and Model 8900F).
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 58394495d220..f6a7b42cc118 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -481,6 +481,8 @@ static struct usb_device_id id_table_combined [] = { | |||
481 | { USB_DEVICE(KOBIL_VID, KOBIL_CONV_KAAN_PID) }, | 481 | { USB_DEVICE(KOBIL_VID, KOBIL_CONV_KAAN_PID) }, |
482 | { USB_DEVICE(POSIFLEX_VID, POSIFLEX_PP7000_PID) }, | 482 | { USB_DEVICE(POSIFLEX_VID, POSIFLEX_PP7000_PID) }, |
483 | { USB_DEVICE(FTDI_VID, FTDI_TTUSB_PID) }, | 483 | { USB_DEVICE(FTDI_VID, FTDI_TTUSB_PID) }, |
484 | { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) }, | ||
485 | { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) }, | ||
484 | { }, /* Optional parameter entry */ | 486 | { }, /* Optional parameter entry */ |
485 | { } /* Terminating entry */ | 487 | { } /* Terminating entry */ |
486 | }; | 488 | }; |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 255ea1f19a44..07d4833c42e1 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
@@ -370,6 +370,12 @@ | |||
370 | #define POSIFLEX_VID 0x0d3a /* Vendor ID */ | 370 | #define POSIFLEX_VID 0x0d3a /* Vendor ID */ |
371 | #define POSIFLEX_PP7000_PID 0x0300 /* PP-7000II thermal printer */ | 371 | #define POSIFLEX_PP7000_PID 0x0300 /* PP-7000II thermal printer */ |
372 | 372 | ||
373 | /* | ||
374 | * Westrex International devices submitted by Cory Lee | ||
375 | */ | ||
376 | #define FTDI_WESTREX_MODEL_777_PID 0xDC00 /* Model 777 */ | ||
377 | #define FTDI_WESTREX_MODEL_8900F_PID 0xDC01 /* Model 8900F */ | ||
378 | |||
373 | /* Commands */ | 379 | /* Commands */ |
374 | #define FTDI_SIO_RESET 0 /* Reset the port */ | 380 | #define FTDI_SIO_RESET 0 /* Reset the port */ |
375 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ | 381 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ |