lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 019/176] USB: serial: Updated support for ICOM devices
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Pieter Maes <maescool@gmail.com>

    commit a9d61bc49188e32d2ae9cf0f683cde3e1744feef upstream.

    I found the original patch on the db0fhn repeater wiki (couldn't find the email
    of the origial author) I guess it was never commited.
    I updated and added some Icom HAM-radio devices to the ftdi driver.
    Added extra comments to make clear what devices it are.

    Signed-off-by: Pieter Maes <maescool@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/usb/serial/ftdi_sio.c | 12 +++++++++++-
    drivers/usb/serial/ftdi_sio_ids.h | 20 ++++++++++++++++----
    2 files changed, 27 insertions(+), 5 deletions(-)

    --- a/drivers/usb/serial/ftdi_sio.c
    +++ b/drivers/usb/serial/ftdi_sio.c
    @@ -675,7 +675,17 @@ static struct usb_device_id id_table_com
    { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) },
    - { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_ID_1_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_OPC_U_UC_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_ID_RP2C1_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_ID_RP2C2_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_ID_RP2D_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_ID_RP2VT_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_ID_RP2VR_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_ID_RP4KVT_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_ID_RP4KVR_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_ID_RP2KVT_PID) },
    + { USB_DEVICE(ICOM_VID, ICOM_ID_RP2KVR_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) },
    --- a/drivers/usb/serial/ftdi_sio_ids.h
    +++ b/drivers/usb/serial/ftdi_sio_ids.h
    @@ -569,11 +569,23 @@
    #define OCT_US101_PID 0x0421 /* OCT US101 USB to RS-232 */

    /*
    - * Icom ID-1 digital transceiver
    + * Definitions for Icom Inc. devices
    */
    -
    -#define ICOM_ID1_VID 0x0C26
    -#define ICOM_ID1_PID 0x0004
    +#define ICOM_VID 0x0C26 /* Icom vendor ID */
    +/* Note: ID-1 is a communications tranceiver for HAM-radio operators */
    +#define ICOM_ID_1_PID 0x0004 /* ID-1 USB to RS-232 */
    +/* Note: OPC is an Optional cable to connect an Icom Tranceiver */
    +#define ICOM_OPC_U_UC_PID 0x0018 /* OPC-478UC, OPC-1122U cloning cable */
    +/* Note: ID-RP* devices are Icom Repeater Devices for HAM-radio */
    +#define ICOM_ID_RP2C1_PID 0x0009 /* ID-RP2C Asset 1 to RS-232 */
    +#define ICOM_ID_RP2C2_PID 0x000A /* ID-RP2C Asset 2 to RS-232 */
    +#define ICOM_ID_RP2D_PID 0x000B /* ID-RP2D configuration port*/
    +#define ICOM_ID_RP2VT_PID 0x000C /* ID-RP2V Transmit config port */
    +#define ICOM_ID_RP2VR_PID 0x000D /* ID-RP2V Receive config port */
    +#define ICOM_ID_RP4KVT_PID 0x0010 /* ID-RP4000V Transmit config port */
    +#define ICOM_ID_RP4KVR_PID 0x0011 /* ID-RP4000V Receive config port */
    +#define ICOM_ID_RP2KVT_PID 0x0012 /* ID-RP2000V Transmit config port */
    +#define ICOM_ID_RP2KVR_PID 0x0013 /* ID-RP2000V Receive config port */

    /*
    * GN Otometrics (http://www.otometrics.com)



    \
     
     \ /
      Last update: 2011-02-16 01:51    [W:3.719 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site