Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 28361
b: refs/heads/master
c: eb79b4f
h: refs/heads/master
i:
  28359: 8709add
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Jun 21, 2006
1 parent 43f4b26 commit 4781d76
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 633a7ecf89587879161179ac4f5a03722626866f
refs/heads/master: eb79b4fda4654eaa7e6421ad41b0a75c7b4f0608
1 change: 1 addition & 0 deletions trunk/drivers/usb/serial/ftdi_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};
Expand Down
6 changes: 6 additions & 0 deletions trunk/drivers/usb/serial/ftdi_sio.h
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,12 @@
*/
#define FTDI_ACG_HFDUAL_PID 0xDD20 /* HF Dual ISO Reader (RFID) */

/*
* Yost Engineering, Inc. products (www.yostengineering.com).
* PID 0xE050 submitted by Aaron Prose.
*/
#define FTDI_YEI_SERVOCENTER31_PID 0xE050 /* YEI ServoCenter3.1 USB */

/* Commands */
#define FTDI_SIO_RESET 0 /* Reset the port */
#define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */
Expand Down

0 comments on commit 4781d76

Please sign in to comment.