diff options
Diffstat (limited to 'epan/dissectors/packet-btamp.c')
| -rw-r--r-- | epan/dissectors/packet-btamp.c | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index afb0543f..4a106d1d 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -17,39 +17,39 @@ #include "packet-btl2cap.h" /* Initialize the protocol and registered fields */ -static int proto_btamp = -1; -static int hf_btamp_command = -1; -static int hf_btamp_cmd_code = -1; -static int hf_btamp_cmd_ident = -1; -static int hf_btamp_cmd_length = -1; -static int hf_btamp_cmd_data = -1; -static int hf_btamp_rej_reason = -1; -static int hf_btamp_mtu = -1; -static int hf_btamp_extfeatures = -1; -static int hf_btamp_lcontroller_id = -1; -static int hf_btamp_rcontroller_id = -1; -static int hf_btamp_controller_list = -1; -static int hf_btamp_controllers = -1; -static int hf_btamp_controller_id = -1; -static int hf_btamp_controller_type = -1; -static int hf_btamp_controller_status = -1; -static int hf_btamp_status = -1; -/* static int hf_btamp_create_status = -1; */ -/* static int hf_btamp_disc_status = -1; */ -static int hf_btamp_total_bw = -1; -static int hf_btamp_max_guaran_bw = -1; -static int hf_btamp_min_latency = -1; -static int hf_btamp_pal_caps_guaranteed = -1; -static int hf_btamp_pal_caps_mask = -1; -static int hf_btamp_amp_assoc_size = -1; -static int hf_btamp_amp_assoc = -1; +static int proto_btamp; +static int hf_btamp_command; +static int hf_btamp_cmd_code; +static int hf_btamp_cmd_ident; +static int hf_btamp_cmd_length; +static int hf_btamp_cmd_data; +static int hf_btamp_rej_reason; +static int hf_btamp_mtu; +static int hf_btamp_extfeatures; +static int hf_btamp_lcontroller_id; +static int hf_btamp_rcontroller_id; +static int hf_btamp_controller_list; +static int hf_btamp_controllers; +static int hf_btamp_controller_id; +static int hf_btamp_controller_type; +static int hf_btamp_controller_status; +static int hf_btamp_status; +/* static int hf_btamp_create_status; */ +/* static int hf_btamp_disc_status; */ +static int hf_btamp_total_bw; +static int hf_btamp_max_guaran_bw; +static int hf_btamp_min_latency; +static int hf_btamp_pal_caps_guaranteed; +static int hf_btamp_pal_caps_mask; +static int hf_btamp_amp_assoc_size; +static int hf_btamp_amp_assoc; /* Initialize the subtree pointers */ -static gint ett_btamp = -1; -static gint ett_btamp_cmd = -1; -static gint ett_btamp_caps = -1; -static gint ett_btamp_controller_entry = -1; -static gint ett_btamp_controller_list = -1; +static int ett_btamp; +static int ett_btamp_cmd; +static int ett_btamp_caps; +static int ett_btamp_controller_entry; +static int ett_btamp_controller_list; static dissector_handle_t btamp_handle; @@ -125,7 +125,7 @@ void proto_reg_handoff_btamp(void); static int dissect_comrej(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - guint16 reason; + uint16_t reason; reason = tvb_get_letohs(tvb, offset); proto_tree_add_item(tree, hf_btamp_rej_reason, tvb, offset, 2, ENC_LITTLE_ENDIAN); @@ -155,7 +155,7 @@ dissect_discoverrequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto } static int -dissect_controller_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint16 idx) +dissect_controller_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, uint16_t idx) { proto_item *ti_controller_entry; proto_tree *btamp_controller_entry_tree; @@ -181,8 +181,8 @@ dissect_controller_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot static int dissect_discoverresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - guint16 length; - guint16 idx = 1; + uint16_t length; + uint16_t idx = 1; proto_item *ti_controller_list; proto_tree *btamp_controller_list_tree; @@ -210,8 +210,8 @@ dissect_discoverresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr static int dissect_changenotify(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - guint16 length; - guint16 idx = 1; + uint16_t length; + uint16_t idx = 1; proto_item *ti_controller_list; proto_tree *btamp_controller_list_tree; @@ -372,11 +372,11 @@ dissect_btamp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U int offset = 0; proto_item *ti; proto_tree *btamp_tree; - guint16 length; + uint16_t length; proto_item *ti_command; proto_tree *btamp_cmd_tree; - guint8 cmd_code; - guint16 cmd_length; + uint8_t cmd_code; + uint16_t cmd_length; col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMP"); @@ -402,7 +402,7 @@ dissect_btamp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U "Command: "); btamp_cmd_tree = proto_item_add_subtree(ti_command, ett_btamp_cmd); - cmd_code = tvb_get_guint8(tvb, offset); + cmd_code = tvb_get_uint8(tvb, offset); proto_tree_add_item(btamp_cmd_tree, hf_btamp_cmd_code, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; @@ -615,7 +615,7 @@ proto_register_btamp(void) }; /* Setup protocol subtree array */ - static gint *ett[] = { + static int *ett[] = { &ett_btamp, &ett_btamp_cmd, &ett_btamp_caps, |