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

USB HID: fix USAGE definition name 

This item is different from USAGE_PAGE, the correct name is USAGE.

Change-Id: I22552391dc564184e5abf14456a94d06a6e7a908
Signed-off-by: Filipe Laíns <lains@archlinux.org>
Reviewed-on: https://code.wireshark.org/review/37556
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Filipe Laíns 2020-06-16 19:27:20 +01:00 committed by Anders Broman
parent a2afe9b255
commit b7f282052c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-usb-hid.c
View File

@ -239,7 +239,7 @@ static const value_string usb_hid_globalitem_bTag_vals[] = {
{15, "[Reserved]"},
{0, NULL}
};
#define USBHID_LOCALITEM_TAG_USAGE_PAGE 0
#define USBHID_LOCALITEM_TAG_USAGE 0
#define USBHID_LOCALITEM_TAG_USAGE_MIN 1
#define USBHID_LOCALITEM_TAG_USAGE_MAX 2
#define USBHID_LOCALITEM_TAG_DESIG_INDEX 3
@ -251,7 +251,7 @@ static const value_string usb_hid_globalitem_bTag_vals[] = {
#define USBHID_LOCALITEM_TAG_STRING_MAX 9
#define USBHID_LOCALITEM_TAG_DELIMITER 10 /* Also listed as reserved in spec! */
static const value_string usb_hid_localitem_bTag_vals[] = {
{USBHID_LOCALITEM_TAG_USAGE_PAGE, "Usage"},
{USBHID_LOCALITEM_TAG_USAGE, "Usage"},
{USBHID_LOCALITEM_TAG_USAGE_MIN, "Usage Minimum"},
{USBHID_LOCALITEM_TAG_USAGE_MAX, "Usage Maximum"},
{USBHID_LOCALITEM_TAG_DESIG_INDEX, "Designator Index"},
@ -3549,7 +3549,7 @@ dissect_usb_hid_report_localitem_data(packet_info *pinfo _U_, proto_tree *tree,
guint32 val;
switch (bTag) {
case USBHID_LOCALITEM_TAG_USAGE_PAGE:
case USBHID_LOCALITEM_TAG_USAGE:
if (bSize > 2) {
/* Full page ID */
proto_tree_add_item(tree, hf_usb_hid_localitem_usage, tvb, offset, bSize, ENC_LITTLE_ENDIAN);