This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / usb / serial / ftdi_sio.h

diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 8866376..e7a7e0a 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -136,7 +136,7 @@
 /*
  * Home Electronics (www.home-electro.com) USB gadgets
  */
-#define FTDI_HE_TIRA1_PID      0xFA78  /* Tira-1 IR transceiver */
+#define FTDI_HE_TIRA1_PID      0xFA78  /* Tira-1 IR tranceiver */
 
 /* USB-UIRT - An infrared receiver and transmitter using the 8U232AM chip */
 /* http://home.earthlink.net/~jrhees/USBUIRT/index.htm */
@@ -144,8 +144,6 @@
 
 /* ELV USB Module UO100 (PID sent by Stefan Frings) */
 #define FTDI_ELV_UO100_PID     0xFB58  /* Product Id */
-/* ELV USB Module UM100 (PID sent by Arnim Laeuger) */
-#define FTDI_ELV_UM100_PID     0xFB5A  /* Product Id */
 
 /*
  * Definitions for ID TECH (www.idt-net.com) devices
@@ -158,8 +156,7 @@
  */
 #define OCT_VID                        0x0B39  /* OCT vendor ID */
 /* Note: OCT US101 is also rebadged as Dick Smith Electronics (NZ) XH6381 */
-/* Also rebadged as Dick Smith Electronics (Aus) XH6451 */
-/* Also rebadged as SIIG Inc. model US2308 hardware version 1 */
+/* Also rebadged as SIIG Inc. model US2308 */
 #define OCT_US101_PID          0x0421  /* OCT US101 USB to RS-232 */
 
 /* an infrared receiver for user access control with IR tags */
@@ -238,36 +235,10 @@
 
 /*
  * RM Michaelides CANview USB (http://www.rmcan.com)
- * CAN fieldbus interface adapter, added by port GmbH www.port.de)
- * Ian Abbott changed the macro names for consistency.
+ * CAN filedbus interface adapter, addad by port GmbH www.port.de)
  */
-#define FTDI_RM_CANVIEW_PID    0xfd60  /* Product Id */
-
-/*
- * EVER Eco Pro UPS (http://www.ever.com.pl/)
- */
-
-#define        EVER_ECO_PRO_CDS        0xe520  /* RS-232 converter */
-
-/*
- * 4N-GALAXY.DE PIDs for CAN-USB, USB-RS232, USB-RS422, USB-RS485,
- * USB-TTY activ, USB-TTY passiv.  Some PIDs are used by several devices
- * and I'm not entirely sure which are used by which.
- */
-#define FTDI_4N_GALAXY_DE_0_PID        0x8372
-#define FTDI_4N_GALAXY_DE_1_PID        0xF3C0
-#define FTDI_4N_GALAXY_DE_2_PID        0xF3C1
-
-/*
- * Mobility Electronics products.
- */
-#define MOBILITY_VID                   0x1342
-#define MOBILITY_USB_SERIAL_PID                0x0202  /* EasiDock USB 200 serial */
-
-/*
- * Active Robots product ids.
- */
-#define FTDI_ACTIVE_ROBOTS_PID 0xE548  /* USB comms board */
+#define FTDI_RM_VID            0x0403  /* Vendor  Id */
+#define FTDI_RMCANVIEW_PID     0xfd60  /* Product Id */
 
 /* Commands */
 #define FTDI_SIO_RESET                 0 /* Reset the port */
@@ -278,8 +249,10 @@
 #define FTDI_SIO_GET_MODEM_STATUS      5 /* Retrieve current value of modern status register */
 #define FTDI_SIO_SET_EVENT_CHAR        6 /* Set the event character */
 #define FTDI_SIO_SET_ERROR_CHAR        7 /* Set the error character */
-#define FTDI_SIO_SET_LATENCY_TIMER     9 /* Set the latency timer */
-#define FTDI_SIO_GET_LATENCY_TIMER     10 /* Get the latency timer */
+
+/* Port interface code for FT2232C */
+#define INTERFACE_A            1
+#define INTERFACE_B            2
 
 
 /*
@@ -529,55 +502,6 @@ typedef enum {
  * and the lValue field contains the XON character.
  */  
  
-/*
- * FTDI_SIO_GET_LATENCY_TIMER
- *
- * Set the timeout interval. The FTDI collects data from the slave
- * device, transmitting it to the host when either A) 62 bytes are
- * received, or B) the timeout interval has elapsed and the buffer
- * contains at least 1 byte.  Setting this value to a small number
- * can dramatically improve performance for applications which send
- * small packets, since the default value is 16ms.
- */
-#define  FTDI_SIO_GET_LATENCY_TIMER_REQUEST FTDI_SIO_GET_LATENCY_TIMER
-#define  FTDI_SIO_GET_LATENCY_TIMER_REQUEST_TYPE 0xC0
-
-/* 
- *  BmRequestType:   1100 0000b
- *  bRequest:        FTDI_SIO_GET_LATENCY_TIMER
- *  wValue:          0
- *  wIndex:          Port
- *  wLength:         0
- *  Data:            latency (on return)
- */
-
-/* 
- * FTDI_SIO_SET_LATENCY_TIMER
- *
- * Set the timeout interval. The FTDI collects data from the slave
- * device, transmitting it to the host when either A) 62 bytes are
- * received, or B) the timeout interval has elapsed and the buffer
- * contains at least 1 byte.  Setting this value to a small number
- * can dramatically improve performance for applications which send
- * small packets, since the default value is 16ms.
- */
-#define  FTDI_SIO_SET_LATENCY_TIMER_REQUEST FTDI_SIO_SET_LATENCY_TIMER
-#define  FTDI_SIO_SET_LATENCY_TIMER_REQUEST_TYPE 0x40
-
-/* 
- *  BmRequestType:   0100 0000b
- *  bRequest:        FTDI_SIO_SET_LATENCY_TIMER
- *  wValue:          Latency (milliseconds)
- *  wIndex:          Port
- *  wLength:         0
- *  Data:            None
- *
- * wValue:
- *   B0..7   Latency timer
- *   B8..15  0
- *
- */
-
 /*
  * FTDI_SIO_SET_EVENT_CHAR 
  *