diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-08 09:11:21 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-08 16:11:51 +0000 |
| commit | 63f18c46b9c7b19de80b7ac400a593aa45475513 (patch) | |
| tree | cf3e6d7c41ce4c8c388bca69bd9ca394c13e4f8f /epan/dissectors | |
| parent | 946dfdbb746e0c6f7e7d650deb66734408cd7f8d (diff) | |
USB device addresses need to be 16-bit.
They are 16-bit in the Windows header; make them that way everywhere, so
that we don't get "shortening 16 bits to 8 bits" warnings.
Change-Id: I18f4c4254f224d76a90f3e87bc2f28cba011b5a3
Reviewed-on: https://code.wireshark.org/review/1021
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-usb.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-usb.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 075f3f34c1..93bc849dc5 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -2410,7 +2410,7 @@ static const value_string bmrequesttype_recipient_vals[] = { static gint try_dissect_next_protocol(proto_tree *tree, proto_tree *parent, tvbuff_t *next_tvb, gint offset, packet_info *pinfo, - usb_conv_info_t *usb_conv_info, gint type, gint type_2, guint8 urb_type, guint16 bus_id, guint8 device_address, + usb_conv_info_t *usb_conv_info, gint type, gint type_2, guint8 urb_type, guint16 bus_id, guint16 device_address, device_product_data_t *device_product_data, device_protocol_data_t *device_protocol_data) { wmem_tree_key_t key[4]; diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h index 2e05f6a8a8..46cdfc0524 100644 --- a/epan/dissectors/packet-usb.h +++ b/epan/dissectors/packet-usb.h @@ -83,7 +83,7 @@ typedef struct _usb_trans_info_t { * there is one such structure for each device/endpoint conversation */ struct _usb_conv_info_t { guint16 bus_id; - guint8 device_address; + guint16 device_address; guint8 endpoint; gint direction; guint8 transfer_type; |