diff options
author | D. Peter Siddons <siddons@bnl.gov> | 2006-06-17 18:09:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-12 19:03:20 -0400 |
commit | 48437486c69b4baf68ee98530d8119897148c602 (patch) | |
tree | 5d70c2a8efb24f9a87ee01b741c7a3a3426bdd0c /drivers | |
parent | 3d861494729c70d9ebeb7d93caa107897925c355 (diff) |
[PATCH] USB: new device id for Thorlabs motor driver
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 8a74b19f1283..5facb022cedc 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -500,6 +500,7 @@ static struct usb_device_id id_table_combined [] = { | |||
500 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, | 500 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, |
501 | { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) }, | 501 | { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) }, |
502 | { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, | 502 | { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, |
503 | { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) }, | ||
503 | { }, /* Optional parameter entry */ | 504 | { }, /* Optional parameter entry */ |
504 | { } /* Terminating entry */ | 505 | { } /* Terminating entry */ |
505 | }; | 506 | }; |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 6ab2ac845bd7..459539220770 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
@@ -442,6 +442,11 @@ | |||
442 | */ | 442 | */ |
443 | #define FTDI_YEI_SERVOCENTER31_PID 0xE050 /* YEI ServoCenter3.1 USB */ | 443 | #define FTDI_YEI_SERVOCENTER31_PID 0xE050 /* YEI ServoCenter3.1 USB */ |
444 | 444 | ||
445 | /* | ||
446 | * ThorLabs USB motor drivers | ||
447 | */ | ||
448 | #define FTDI_THORLABS_PID 0xfaf0 /* ThorLabs USB motor drivers */ | ||
449 | |||
445 | /* Commands */ | 450 | /* Commands */ |
446 | #define FTDI_SIO_RESET 0 /* Reset the port */ | 451 | #define FTDI_SIO_RESET 0 /* Reset the port */ |
447 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ | 452 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ |