Dissect USB Com Network Control Model requests
svn path=/trunk/; revision=53349
This commit is contained in:
Pascal Quantin
parent
47c6288b0e
commit
70b9ce2b48
|
|
@ -3417,10 +3417,6 @@ dissect_mbim_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
|
|||
struct mbim_conv_info *mbim_conv;
|
||||
struct mbim_info *mbim_info;
|
||||
|
||||
if (tvb_length(tvb) < 12) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MBIM");
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
|
|
|
|||
|
|
@ -34,6 +34,39 @@ static int hf_usb_com_descriptor_subtype = -1;
|
|||
static int hf_usb_com_descriptor_cdc = -1;
|
||||
static int hf_usb_com_descriptor_payload = -1;
|
||||
static int hf_usb_com_control_subclass = -1;
|
||||
static int hf_usb_com_control_request_code = -1;
|
||||
static int hf_usb_com_control_value = -1;
|
||||
static int hf_usb_com_control_index = -1;
|
||||
static int hf_usb_com_control_length = -1;
|
||||
static int hf_usb_com_control_response_code = -1;
|
||||
static int hf_usb_com_get_ntb_params_length = -1;
|
||||
static int hf_usb_com_get_ntb_params_ntb_formats_supported = -1;
|
||||
static int hf_usb_com_get_ntb_params_ntb_formats_supported_16bit = -1;
|
||||
static int hf_usb_com_get_ntb_params_ntb_formats_supported_32bit = -1;
|
||||
static int hf_usb_com_get_ntb_params_ntb_in_max_size = -1;
|
||||
static int hf_usb_com_get_ntb_params_ndp_in_divisor = -1;
|
||||
static int hf_usb_com_get_ntb_params_ndp_in_payload_remainder = -1;
|
||||
static int hf_usb_com_get_ntb_params_ndp_in_alignment = -1;
|
||||
static int hf_usb_com_get_ntb_params_reserved = -1;
|
||||
static int hf_usb_com_get_ntb_params_ntb_out_max_size = -1;
|
||||
static int hf_usb_com_get_ntb_params_ndp_out_divisor = -1;
|
||||
static int hf_usb_com_get_ntb_params_ndp_out_payload_remainder = -1;
|
||||
static int hf_usb_com_get_ntb_params_ndp_out_alignment = -1;
|
||||
static int hf_usb_com_get_ntb_params_ntb_out_max_datagrams = -1;
|
||||
static int hf_usb_com_get_net_address_eui48 = -1;
|
||||
static int hf_usb_com_set_net_address_eui48 = -1;
|
||||
static int hf_usb_com_get_ntb_format_ntb_format = -1;
|
||||
static int hf_usb_com_set_ntb_format_ntb_format = -1;
|
||||
static int hf_usb_com_get_ntb_input_size_ntb_in_max_size = -1;
|
||||
static int hf_usb_com_get_ntb_input_size_ntb_in_max_datagrams = -1;
|
||||
static int hf_usb_com_get_ntb_input_size_reserved = -1;
|
||||
static int hf_usb_com_set_ntb_input_size_ntb_in_max_size = -1;
|
||||
static int hf_usb_com_set_ntb_input_size_ntb_in_max_datagrams = -1;
|
||||
static int hf_usb_com_set_ntb_input_size_reserved = -1;
|
||||
static int hf_usb_com_get_max_datagram_size_size = -1;
|
||||
static int hf_usb_com_set_max_datagram_size_size = -1;
|
||||
static int hf_usb_com_get_crc_mode_crc_mode = -1;
|
||||
static int hf_usb_com_set_crc_mode_crc_mode = -1;
|
||||
static int hf_usb_com_capabilities = -1;
|
||||
static int hf_usb_com_descriptor_acm_capabilities_reserved = -1;
|
||||
static int hf_usb_com_descriptor_acm_capabilities_network_connection = -1;
|
||||
|
|
@ -50,6 +83,7 @@ static int hf_usb_com_control_payload = -1;
|
|||
|
||||
static gint ett_usb_com = -1;
|
||||
static gint ett_usb_com_capabilities = -1;
|
||||
static gint ett_usb_com_bitmap = -1;
|
||||
|
||||
static dissector_handle_t mbim_control_handle;
|
||||
static dissector_handle_t mbim_descriptor_handle;
|
||||
|
|
@ -136,6 +170,124 @@ static const value_string usb_com_subclass_vals[] = {
|
|||
};
|
||||
value_string_ext ext_usb_com_subclass_vals = VALUE_STRING_EXT_INIT(usb_com_subclass_vals);
|
||||
|
||||
#define SEND_ENCAPSULATED_COMMAND 0x00
|
||||
#define GET_ENCAPSULATED_RESPONSE 0x01
|
||||
#define SET_COMM_FEATURE 0x02
|
||||
#define GET_COMM_FEATURE 0x03
|
||||
#define CLEAR_COMM_FEATURE 0x04
|
||||
#define RESET_FUNCTION 0x05
|
||||
#define SET_AUX_LINE_STATE 0x10
|
||||
#define SET_HOOK_STATE 0x11
|
||||
#define PULSE_SETUP 0x12
|
||||
#define SEND_PULSE 0x13
|
||||
#define SET_PULSE_TIME 0x14
|
||||
#define RING_AUX_JACK 0x15
|
||||
#define SET_LINE_CODING 0x20
|
||||
#define GET_LINE_CODING 0x21
|
||||
#define SET_CONTROL_LINE_STATE 0x22
|
||||
#define SEND_BREAK 0x23
|
||||
#define SET_RINGER_PARMS 0x30
|
||||
#define GET_RINGER_PARMS 0x31
|
||||
#define SET_OPERATION_PARMS 0x32
|
||||
#define GET_OPERATION_PARMS 0x33
|
||||
#define SET_LINE_PARMS 0x34
|
||||
#define GET_LINE_PARMS 0x35
|
||||
#define DIAL_DIGITS 0x36
|
||||
#define SET_UNIT_PARAMETER 0x37
|
||||
#define GET_UNIT_PARAMETER 0x38
|
||||
#define CLEAR_UNIT_PARAMETER 0x39
|
||||
#define GET_PROFILE 0x3a
|
||||
#define SET_ETHERNET_MULTICAST_FILTERS 0x40
|
||||
#define SET_ETHERNET_POWER_MANAGEMENT_PATTERN_FILTER 0x41
|
||||
#define GET_ETHERNET_POWER_MANAGEMENT_PATTERN_FILTER 0x42
|
||||
#define SET_ETHERNET_PACKET_FILTER 0x43
|
||||
#define GET_ETHERNET_STATISTIC 0x44
|
||||
#define SET_ATM_DATA_FORMAT 0x50
|
||||
#define GET_ATM_DEVICE_STATISTICS 0x51
|
||||
#define SET_ATM_DEFAULT_VC 0x52
|
||||
#define GET_ATM_VC_STATISTICS 0x53
|
||||
#define GET_NTB_PARAMETERS 0x80
|
||||
#define GET_NET_ADDRESS 0x81
|
||||
#define SET_NET_ADDRESS 0x82
|
||||
#define GET_NTB_FORMAT 0x83
|
||||
#define SET_NTB_FORMAT 0x84
|
||||
#define GET_NTB_INPUT_SIZE 0x85
|
||||
#define SET_NTB_INPUT_SIZE 0x86
|
||||
#define GET_MAX_DATAGRAM_SIZE 0x87
|
||||
#define SET_MAX_DATAGRAM_SIZE 0x88
|
||||
#define GET_CRC_MODE 0x89
|
||||
#define SET_CRC_MODE 0x8a
|
||||
|
||||
static const value_string usb_com_setup_request_vals[] = {
|
||||
{SEND_ENCAPSULATED_COMMAND, "SEND ENCAPSULATED COMMAND"},
|
||||
{GET_ENCAPSULATED_RESPONSE, "GET ENCAPSULATED RESPONSE"},
|
||||
{SET_COMM_FEATURE, "SET COMM FEATURE"},
|
||||
{GET_COMM_FEATURE, "GET COMM FEATURE"},
|
||||
{CLEAR_COMM_FEATURE, "CLEAR COMM FEATURE"},
|
||||
{RESET_FUNCTION, "RESET FUNCTION"},
|
||||
{SET_AUX_LINE_STATE, "SET AUX LINE STATE"},
|
||||
{SET_HOOK_STATE, "SET HOOK STATE"},
|
||||
{PULSE_SETUP, "PULSE SETUP"},
|
||||
{SEND_PULSE, "SEND PULSE"},
|
||||
{SET_PULSE_TIME, "SET PULSE TIME"},
|
||||
{RING_AUX_JACK, "RING AUX JACK"},
|
||||
{SET_LINE_CODING, "SET LINE CODING"},
|
||||
{GET_LINE_CODING, "GET LINE CODING"},
|
||||
{SET_CONTROL_LINE_STATE, "SET CONTROL LINE STATE"},
|
||||
{SEND_BREAK, "SEND BREAK"},
|
||||
{SET_RINGER_PARMS, "SET RINGER PARMS"},
|
||||
{GET_RINGER_PARMS, "GET RINGER PARMS"},
|
||||
{SET_OPERATION_PARMS, "SET OPERATION PARMS"},
|
||||
{GET_OPERATION_PARMS, "GET OPERATION PARMS"},
|
||||
{SET_LINE_PARMS, "SET LINE PARMS"},
|
||||
{GET_LINE_PARMS, "GET LINE PARMS"},
|
||||
{DIAL_DIGITS, "DIAL DIGITS"},
|
||||
{SET_UNIT_PARAMETER, "SET UNIT PARAMETER"},
|
||||
{GET_UNIT_PARAMETER, "GET UNIT PARAMETER"},
|
||||
{CLEAR_UNIT_PARAMETER, "CLEAR UNIT PARAMETER"},
|
||||
{GET_PROFILE, "GET PROFILE"},
|
||||
{SET_ETHERNET_MULTICAST_FILTERS, "SET ETHERNET MULTICAST FILTERS"},
|
||||
{SET_ETHERNET_POWER_MANAGEMENT_PATTERN_FILTER, "SET ETHERNET POWER MANAGEMENT PATTERN FILTER"},
|
||||
{GET_ETHERNET_POWER_MANAGEMENT_PATTERN_FILTER, "GET ETHERNET POWER MANAGEMENT PATTERN FILTER"},
|
||||
{SET_ETHERNET_PACKET_FILTER, "SET ETHERNET PACKET FILTER"},
|
||||
{GET_ETHERNET_STATISTIC, "GET ETHERNET STATISTIC"},
|
||||
{SET_ATM_DATA_FORMAT, "SET ATM DATA FORMAT"},
|
||||
{GET_ATM_DEVICE_STATISTICS, "GET ATM DEVICE STATISTICS"},
|
||||
{SET_ATM_DEFAULT_VC, "SET ATM DEFAULT VC"},
|
||||
{GET_ATM_VC_STATISTICS, "GET ATM VC STATISTICS"},
|
||||
{GET_NTB_PARAMETERS, "GET NTB PARAMETERS"},
|
||||
{GET_NET_ADDRESS, "GET NET ADDRESS"},
|
||||
{SET_NET_ADDRESS, "SET NET ADDRESS"},
|
||||
{GET_NTB_FORMAT, "GET NTB FORMAT"},
|
||||
{SET_NTB_FORMAT, "SET NTB FORMAT"},
|
||||
{GET_NTB_INPUT_SIZE, "GET NTB INPUT SIZE"},
|
||||
{SET_NTB_INPUT_SIZE, "SET NTB INPUT SIZE"},
|
||||
{GET_MAX_DATAGRAM_SIZE, "GET MAX DATAGRAM SIZE"},
|
||||
{SET_MAX_DATAGRAM_SIZE, "SET MAX DATAGRAM SIZE"},
|
||||
{GET_CRC_MODE, "GET CRC MODE"},
|
||||
{SET_CRC_MODE, "SET CRC MODE"},
|
||||
{0, NULL}
|
||||
};
|
||||
static value_string_ext usb_com_setup_request_vals_ext = VALUE_STRING_EXT_INIT(usb_com_setup_request_vals);
|
||||
|
||||
static const int *usb_com_get_ntb_params_ntb_formats_supported_fields[] = {
|
||||
&hf_usb_com_get_ntb_params_ntb_formats_supported_16bit,
|
||||
&hf_usb_com_get_ntb_params_ntb_formats_supported_32bit,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const value_string usb_com_ntb_format_vals[] = {
|
||||
{ 0x0000, "NTB-16"},
|
||||
{ 0x0001, "NTB-32"},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
static const value_string usb_com_crc_mode_vals[] = {
|
||||
{ 0x0000, "CRCs shall not be appended"},
|
||||
{ 0x0001, "CRCs shall be appended"},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
void proto_register_usb_com(void);
|
||||
void proto_reg_handoff_usb_com(void);
|
||||
|
||||
|
|
@ -215,13 +367,69 @@ dissect_usb_com_descriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
return tvb_length(tvb);
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_usb_com_get_ntb_params(tvbuff_t *tvb, proto_tree *tree, gint base_offset)
|
||||
{
|
||||
gint offset = base_offset;
|
||||
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_length, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_bitmask(tree, tvb, offset, hf_usb_com_get_ntb_params_ntb_formats_supported, ett_usb_com_bitmap,
|
||||
usb_com_get_ntb_params_ntb_formats_supported_fields, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_ntb_in_max_size, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_ndp_in_divisor, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_ndp_in_payload_remainder, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_ndp_in_alignment, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_reserved, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_ntb_out_max_size, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_ndp_out_divisor, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_ndp_out_payload_remainder, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_ndp_out_alignment, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(tree, hf_usb_com_get_ntb_params_ntb_out_max_datagrams, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_usb_com_ntb_input_size(tvbuff_t *tvb, proto_tree *tree, gint base_offset, gboolean is_set)
|
||||
{
|
||||
gint offset = base_offset;
|
||||
|
||||
proto_tree_add_item(tree, is_set ? hf_usb_com_set_ntb_input_size_ntb_in_max_size :
|
||||
hf_usb_com_get_ntb_input_size_ntb_in_max_size, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
offset += 4;
|
||||
if (tvb_reported_length_remaining(tvb, offset) > 0) {
|
||||
proto_tree_add_item(tree, is_set ? hf_usb_com_set_ntb_input_size_ntb_in_max_datagrams :
|
||||
hf_usb_com_get_ntb_input_size_ntb_in_max_datagrams, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(tree, is_set ? hf_usb_com_set_ntb_input_size_reserved :
|
||||
hf_usb_com_get_ntb_input_size_reserved, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_usb_com_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
|
||||
{
|
||||
usb_conv_info_t *usb_conv_info = (usb_conv_info_t *)data;
|
||||
usb_trans_info_t *usb_trans_info;
|
||||
proto_tree *subtree;
|
||||
proto_item *ti;
|
||||
gint offset = 0;
|
||||
gboolean is_request;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBCOM");
|
||||
|
||||
|
|
@ -229,21 +437,107 @@ dissect_usb_com_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
|
|||
subtree = proto_item_add_subtree(ti, ett_usb_com);
|
||||
|
||||
if (usb_conv_info) {
|
||||
usb_trans_info = usb_conv_info->usb_trans_info;
|
||||
|
||||
ti = proto_tree_add_uint(subtree, hf_usb_com_control_subclass, tvb, 0, 0,
|
||||
usb_conv_info->interfaceSubclass);
|
||||
PROTO_ITEM_SET_GENERATED(ti);
|
||||
|
||||
switch (usb_conv_info->interfaceSubclass)
|
||||
is_request = (pinfo->srcport==NO_ENDPOINT);
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
|
||||
val_to_str_ext(usb_trans_info->setup.request, &usb_com_setup_request_vals_ext, "Unknown type %x"),
|
||||
is_request ? "Request" : "Response");
|
||||
|
||||
if (is_request) {
|
||||
proto_tree_add_item(subtree, hf_usb_com_control_request_code, tvb, offset, 1, ENC_LITTLE_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(subtree, hf_usb_com_control_value, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(subtree, hf_usb_com_control_index, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(subtree, hf_usb_com_control_length, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
} else {
|
||||
ti = proto_tree_add_uint(subtree, hf_usb_com_control_response_code, tvb, 0, 0,
|
||||
usb_trans_info->setup.request);
|
||||
PROTO_ITEM_SET_GENERATED(ti);
|
||||
}
|
||||
|
||||
switch (usb_trans_info->setup.request)
|
||||
{
|
||||
case COM_SUBCLASS_MBIM:
|
||||
offset = call_dissector_only(mbim_control_handle, tvb, pinfo, tree, NULL);
|
||||
case SEND_ENCAPSULATED_COMMAND:
|
||||
case GET_ENCAPSULATED_RESPONSE:
|
||||
if (!is_request && (usb_conv_info->interfaceSubclass == COM_SUBCLASS_MBIM)) {
|
||||
offset = call_dissector_only(mbim_control_handle, tvb, pinfo, tree, NULL);
|
||||
}
|
||||
break;
|
||||
case GET_NTB_PARAMETERS:
|
||||
if (!is_request) {
|
||||
offset = dissect_usb_com_get_ntb_params(tvb, subtree, offset);
|
||||
}
|
||||
break;
|
||||
case GET_NET_ADDRESS:
|
||||
if (!is_request) {
|
||||
proto_tree_add_item(subtree, hf_usb_com_get_net_address_eui48, tvb, offset, 6, ENC_NA);
|
||||
offset += 6;
|
||||
}
|
||||
break;
|
||||
case SET_NET_ADDRESS:
|
||||
if (is_request) {
|
||||
proto_tree_add_item(subtree, hf_usb_com_set_net_address_eui48, tvb, offset, 6, ENC_NA);
|
||||
offset += 6;
|
||||
}
|
||||
break;
|
||||
case GET_NTB_FORMAT:
|
||||
if (!is_request) {
|
||||
proto_tree_add_item(subtree, hf_usb_com_get_ntb_format_ntb_format, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
break;
|
||||
case SET_NTB_FORMAT:
|
||||
if (is_request) {
|
||||
proto_tree_add_item(subtree, hf_usb_com_set_ntb_format_ntb_format, tvb, offset-6, 2, ENC_LITTLE_ENDIAN);
|
||||
}
|
||||
break;
|
||||
case GET_NTB_INPUT_SIZE:
|
||||
if (!is_request) {
|
||||
offset = dissect_usb_com_ntb_input_size(tvb, subtree, offset, FALSE);
|
||||
}
|
||||
break;
|
||||
case SET_NTB_INPUT_SIZE:
|
||||
if (!is_request) {
|
||||
offset = dissect_usb_com_ntb_input_size(tvb, subtree, offset, TRUE);
|
||||
}
|
||||
break;
|
||||
case GET_MAX_DATAGRAM_SIZE:
|
||||
if (!is_request) {
|
||||
proto_tree_add_item(subtree, hf_usb_com_get_max_datagram_size_size, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
break;
|
||||
case SET_MAX_DATAGRAM_SIZE:
|
||||
if (is_request) {
|
||||
proto_tree_add_item(subtree, hf_usb_com_set_max_datagram_size_size, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
break;
|
||||
case GET_CRC_MODE:
|
||||
if (!is_request) {
|
||||
proto_tree_add_item(subtree, hf_usb_com_get_crc_mode_crc_mode, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
break;
|
||||
case SET_CRC_MODE:
|
||||
if (is_request) {
|
||||
proto_tree_add_item(subtree, hf_usb_com_set_crc_mode_crc_mode, tvb, offset-6, 2, ENC_LITTLE_ENDIAN);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (tvb_reported_length_remaining(tvb, offset) != 0) {
|
||||
if (tvb_reported_length_remaining(tvb, offset) > 0) {
|
||||
proto_tree_add_item(subtree, hf_usb_com_control_payload, tvb, offset, -1, ENC_NA);
|
||||
}
|
||||
return tvb_length(tvb);
|
||||
|
|
@ -286,6 +580,105 @@ proto_register_usb_com(void)
|
|||
{ &hf_usb_com_control_subclass,
|
||||
{ "Subclass", "usbcom.control.subclass", FT_UINT8, BASE_HEX|BASE_EXT_STRING,
|
||||
&ext_usb_com_subclass_vals, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_control_request_code,
|
||||
{ "Request Code", "usbcom.control.request_code", FT_UINT8, BASE_HEX|BASE_EXT_STRING,
|
||||
&usb_com_setup_request_vals_ext, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_control_value,
|
||||
{ "Value", "usbcom.control.value", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_control_index,
|
||||
{ "Index", "usbcom.control.index", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_control_length,
|
||||
{ "Length", "usbcom.control.length", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_control_response_code,
|
||||
{ "Response Code", "usbcom.control.response_code", FT_UINT8, BASE_HEX|BASE_EXT_STRING,
|
||||
&usb_com_setup_request_vals_ext, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_length,
|
||||
{ "Length", "usbcom.control.get_ntb_params.length", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ntb_formats_supported,
|
||||
{ "NTB Formats Supported", "usbcom.control.get_ntb_params.ntb_formats_supported", FT_UINT16, BASE_HEX,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ntb_formats_supported_16bit,
|
||||
{ "16-bit NTB", "usbcom.control.get_ntb_params.ntb_formats_supported.16bit", FT_BOOLEAN, 16,
|
||||
TFS(&tfs_supported_not_supported), 0x0001, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ntb_formats_supported_32bit,
|
||||
{ "32-bit NTB", "usbcom.control.get_ntb_params.ntb_formats_supported.32bit", FT_BOOLEAN, 16,
|
||||
TFS(&tfs_supported_not_supported), 0x0002, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ntb_in_max_size,
|
||||
{ "NTB IN Max Size", "usbcom.control.get_ntb_params.ntb_in_max_size", FT_UINT32, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ndp_in_divisor,
|
||||
{ "NDP IN Divisor", "usbcom.control.get_ntb_params.ndp_in_divisor", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ndp_in_payload_remainder,
|
||||
{ "NDP IN Payload Remainder", "usbcom.control.get_ntb_params.ndp_in_payload_remainder", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ndp_in_alignment,
|
||||
{ "NDP IN Alignment", "usbcom.control.get_ntb_params.ndp_in_alignment", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_reserved,
|
||||
{ "Reserved", "usbcom.control.get_ntb_params.reserved", FT_UINT16, BASE_HEX,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ntb_out_max_size,
|
||||
{ "NTB OUT Max Size", "usbcom.control.get_ntb_params.ntb_out_max_size", FT_UINT32, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ndp_out_divisor,
|
||||
{ "NDP OUT Divisor", "usbcom.control.get_ntb_params.ndp_out_divisor", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ndp_out_payload_remainder,
|
||||
{ "NDP OUT Payload Remainder", "usbcom.control.get_ntb_params.ndp_out_payload_remainder", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ndp_out_alignment,
|
||||
{ "NDP OUT Alignment", "usbcom.control.get_ntb_params.ndp_out_alignment", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_params_ntb_out_max_datagrams,
|
||||
{ "NTB OUT Max Datagrams", "usbcom.control.get_ntb_params.ntb_out_max_datagrams", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_net_address_eui48,
|
||||
{ "EUI-48", "usbcom.control.get_net_address.eui48", FT_ETHER, BASE_NONE,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_set_net_address_eui48,
|
||||
{ "EUI-48", "usbcom.control.set_net_address.eui48", FT_ETHER, BASE_NONE,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_format_ntb_format,
|
||||
{ "NTB Format", "usbcom.control.get_net_address.ntb_format", FT_UINT16, BASE_HEX,
|
||||
VALS(usb_com_ntb_format_vals), 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_set_ntb_format_ntb_format,
|
||||
{ "NTB Format", "usbcom.control.set_net_address.ntb_format", FT_UINT16, BASE_HEX,
|
||||
VALS(usb_com_ntb_format_vals), 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_input_size_ntb_in_max_size,
|
||||
{ "NTB IN Max Size", "usbcom.control.get_ntb_input_size.ntb_in_max_size", FT_UINT32, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_input_size_ntb_in_max_datagrams,
|
||||
{ "NTB IN Max Datagrams", "usbcom.control.get_ntb_input_size.ntb_in_max_datagrams", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_ntb_input_size_reserved,
|
||||
{ "Reserved", "usbcom.control.get_ntb_input_size.reserved", FT_UINT16, BASE_HEX,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_set_ntb_input_size_ntb_in_max_size,
|
||||
{ "NTB IN Max Size", "usbcom.control.set_ntb_input_size.ntb_in_max_size", FT_UINT32, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_set_ntb_input_size_ntb_in_max_datagrams,
|
||||
{ "NTB IN Max Datagrams", "usbcom.control.set_ntb_input_size.ntb_in_max_datagrams", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_set_ntb_input_size_reserved,
|
||||
{ "Reserved", "usbcom.control.set_ntb_input_size.reserved", FT_UINT16, BASE_HEX,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_max_datagram_size_size,
|
||||
{ "Max Datagram Size", "usbcom.control.get_max_datagram_size.size", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_set_max_datagram_size_size,
|
||||
{ "Max Datagram Size", "usbcom.control.set_max_datagram_size.size", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_get_crc_mode_crc_mode,
|
||||
{ "CRC Mode", "usbcom.control.get_crc_mode.crc_mode", FT_UINT16, BASE_HEX,
|
||||
VALS(usb_com_crc_mode_vals), 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_set_crc_mode_crc_mode,
|
||||
{ "CRC Mode", "usbcom.control.set_crc_mode.crc_mode", FT_UINT16, BASE_HEX,
|
||||
VALS(usb_com_crc_mode_vals), 0, NULL, HFILL }},
|
||||
{ &hf_usb_com_capabilities,
|
||||
{ "bmCapabilities", "usbcom.descriptor.capabilities", FT_UINT8, BASE_HEX,
|
||||
NULL, 0, NULL, HFILL }},
|
||||
|
|
@ -329,7 +722,8 @@ proto_register_usb_com(void)
|
|||
|
||||
static gint *usb_com_subtrees[] = {
|
||||
&ett_usb_com,
|
||||
&ett_usb_com_capabilities
|
||||
&ett_usb_com_capabilities,
|
||||
&ett_usb_com_bitmap
|
||||
};
|
||||
|
||||
proto_usb_com = proto_register_protocol("USB Communications and CDC Control", "USBCOM", "usbcom");
|
||||
|
|
|
|||
Loading…
Reference in New Issue