diff options
author | Rui Santos <rsantos@grupopie.com> | 2006-01-09 08:12:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-31 20:23:37 -0500 |
commit | 09c280a24650ff74e713742e94120fdf7765cda8 (patch) | |
tree | 4b6bbeac3b24adeaee6fc85392f4ab7a0648d3fb /drivers | |
parent | ce40d290c111c3d418ef444f82c349de134a0a74 (diff) |
[PATCH] USB: ftdi: Two new ATIK based USB astronomical CCD cameras
Documentation: Specify grayscale specification on ATIK-ATK16
and ATIK-ATK16HR comments.
New: Add ProductID and VendorID for devices ATIK-ATK16C and
ATIK-ATK16HRC. These devices are also USB Astronomical CCD
cameras that work through an FTDI 245BM chip, share the
same base hardware but, it has a colour CCD chip instead
of a grayscale one.
Signed-off-by: Rui Santos <rsantos@grupopie.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index ef20d83a81b8..f2b4ca8692d8 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -476,7 +476,9 @@ static struct usb_device_id id_table_combined [] = { | |||
476 | { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) }, | 476 | { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) }, |
477 | { USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) }, | 477 | { USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) }, |
478 | { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) }, | 478 | { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) }, |
479 | { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) }, | ||
479 | { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HR_PID) }, | 480 | { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HR_PID) }, |
481 | { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HRC_PID) }, | ||
480 | { USB_DEVICE(KOBIL_VID, KOBIL_CONV_B1_PID) }, | 482 | { USB_DEVICE(KOBIL_VID, KOBIL_CONV_B1_PID) }, |
481 | { USB_DEVICE(KOBIL_VID, KOBIL_CONV_KAAN_PID) }, | 483 | { USB_DEVICE(KOBIL_VID, KOBIL_CONV_KAAN_PID) }, |
482 | { USB_DEVICE(POSIFLEX_VID, POSIFLEX_PP7000_PID) }, | 484 | { USB_DEVICE(POSIFLEX_VID, POSIFLEX_PP7000_PID) }, |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 09807afaf583..ca40f16370f1 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
@@ -226,8 +226,10 @@ | |||
226 | * Definitions for ATIK Instruments astronomical USB based cameras | 226 | * Definitions for ATIK Instruments astronomical USB based cameras |
227 | * Check it at http://www.atik-instruments.com/ | 227 | * Check it at http://www.atik-instruments.com/ |
228 | */ | 228 | */ |
229 | #define FTDI_ATIK_ATK16_PID 0xDF30 /* ATIK ATK-16 Camera */ | 229 | #define FTDI_ATIK_ATK16_PID 0xDF30 /* ATIK ATK-16 Grayscale Camera */ |
230 | #define FTDI_ATIK_ATK16HR_PID 0xDF31 /* ATIK ATK-16HR Camera */ | 230 | #define FTDI_ATIK_ATK16C_PID 0xDF32 /* ATIK ATK-16C Colour Camera */ |
231 | #define FTDI_ATIK_ATK16HR_PID 0xDF31 /* ATIK ATK-16HR Grayscale Camera */ | ||
232 | #define FTDI_ATIK_ATK16HRC_PID 0xDF33 /* ATIK ATK-16HRC Colour Camera */ | ||
231 | 233 | ||
232 | /* | 234 | /* |
233 | * Protego product ids | 235 | * Protego product ids |