Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 156549
b: refs/heads/master
c: c47aacc
h: refs/heads/master
i:
  156547: a2d1b74
v: v3
  • Loading branch information
Marko Hänninen authored and Greg Kroah-Hartman committed Aug 7, 2009
1 parent 7241ed3 commit 68c713d
Show file tree
Hide file tree
Showing 3 changed files with 9 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: ef4638f955f2c4a667c8af20769d03f5ed3781ca
refs/heads/master: c47aacc67a3d26dfab9c9b8965975ed2b2010b30
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 @@ -699,6 +699,7 @@ static struct usb_device_id id_table_combined [] = {
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
{ USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) },
{ USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) },
{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};
Expand Down
7 changes: 7 additions & 0 deletions trunk/drivers/usb/serial/ftdi_sio.h
Original file line number Diff line number Diff line change
Expand Up @@ -953,6 +953,13 @@
#define GN_OTOMETRICS_VID 0x0c33 /* Vendor ID */
#define AURICAL_USB_PID 0x0010 /* Aurical USB Audiometer */

/*
* Bayer Ascensia Contour blood glucose meter USB-converter cable.
* http://winglucofacts.com/cables/
*/
#define BAYER_VID 0x1A79
#define BAYER_CONTOUR_CABLE_PID 0x6001

/*
* BmRequestType: 1100 0000b
* bRequest: FTDI_E2_READ
Expand Down

0 comments on commit 68c713d

Please sign in to comment.