osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

FTDI FT: Add Amontec JTAGkey USB VID/PID 

Ping-Bug: 11743
Change-Id: I5fd08362e468abf4f2d94f10ef16107d52144357
Reviewed-on: https://code.wireshark.org/review/36165
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Tomasz Moń <desowin@gmail.com>
This commit is contained in:
Tomasz Moń 2020-02-23 10:32:49 +01:00
parent 7620ba7f72
commit a9d7ce53b1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-ftdi-ft.c
View File

@ -1282,7 +1282,8 @@ proto_reg_handoff_ftdi_ft(void)
dissector_add_uint("usb.product", (0x0403 << 16) | 0x6014, ftdi_ft_handle);
dissector_add_uint("usb.product", (0x0403 << 16) | 0x6015, ftdi_ft_handle);
/* Devices that use FTDI FT converter with changed Vendor ID */
/* Devices that use FTDI FT converter with changed Vendor ID and/or Product ID */
dissector_add_uint("usb.product", (0x0403 << 16) | 0xcff8, ftdi_ft_handle); /* Amontec JTAGkey */
dissector_add_uint("usb.product", (0x15ba << 16) | 0x0003, ftdi_ft_handle); /* Olimex ARM-USB-OCD */
dissector_add_uint("usb.product", (0x15ba << 16) | 0x0004, ftdi_ft_handle); /* Olimex ARM-USB-TINY */
dissector_add_uint("usb.product", (0x15ba << 16) | 0x002a, ftdi_ft_handle); /* Olimex ARM-USB-TINY-H */