aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-usb-hid.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-05-24 09:17:11 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-05-24 09:17:11 +0000
commitd40cb34ba95e207eb6bb9a6697af795970fc9dea (patch)
tree3bd27f6c0f3480f8914aa70c4cba0c70de41bf19 /epan/dissectors/packet-usb-hid.c
parentfacd4aca9d1e775caa531906f935564b0c8c6f27 (diff)
From Martin Kaiser:
RVALS() needs BASE_RANGE_STRING https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7282 svn path=/trunk/; revision=42823
Diffstat (limited to 'epan/dissectors/packet-usb-hid.c')
-rw-r--r--epan/dissectors/packet-usb-hid.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c
index 232555bb5d..3e1a965613 100644
--- a/epan/dissectors/packet-usb-hid.c
+++ b/epan/dissectors/packet-usb-hid.c
@@ -880,13 +880,13 @@ proto_register_usb_hid(void)
TFS(&tfs_mainitem_bit8), 1<<8, NULL, HFILL }},
{ &hf_usb_hid_mainitem_colltype,
- { "Collection type", "usbhid.item.main.colltype", FT_UINT8, BASE_HEX,
+ { "Collection type", "usbhid.item.main.colltype", FT_UINT8, BASE_RANGE_STRING|BASE_HEX,
RVALS(usb_hid_mainitem_colltype_vals), 0, NULL, HFILL }},
/* Global-report item data */
{ &hf_usb_hid_globalitem_usage,
- { "Usage page", "usbhid.item.global.usage", FT_UINT8, BASE_HEX,
+ { "Usage page", "usbhid.item.global.usage", FT_UINT8, BASE_RANGE_STRING|BASE_HEX,
RVALS(usb_hid_item_usage_vals), 0, NULL, HFILL }},
{ &hf_usb_hid_globalitem_log_min,
@@ -960,7 +960,7 @@ proto_register_usb_hid(void)
/* Local-report item data */
{ &hf_usb_hid_localitem_usage,
- { "Usage", "usbhid.item.local.usage", FT_UINT8, BASE_HEX,
+ { "Usage", "usbhid.item.local.usage", FT_UINT8, BASE_RANGE_STRING|BASE_HEX,
RVALS(usb_hid_item_usage_vals), 0, NULL, HFILL }},
{ &hf_usb_hid_localitem_usage_min,