osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Bluetooth: HCI_CMD: Implement a lot of remaining commands 

Commands:
  Enhanced Setup Synchronous Connection
  Enhanced Accept Synchronous Connection Request
  Truncated Page
  Truncated Page Cancel
  Set Connectionless Slave Broadcast
  Set Connectionless Slave Broadcast Receive
  Start Synchronization Train
  Receive Synchronization Train
  Remote OOB Extended Data Request Reply
  Set MWS Channel Parameters
  Set External Frame Configuration
  Set MWS Signaling
  Set MWS Transport Layer
  Set MWS Scan Frequency Table
  Set MWS Pattern Configuration
  Set Reserved LT_ADDR
  Delete Reserved LT_ADDR
  Set Triggered Clock Capture
  AMP Test
  Write Secure Connections Test Mode

Fix copy-paste issue:
Implementation for "Get MWS Transport Layer Configuration"
was in: "Set Triggered Clock Capture"

Change-Id: I4a2119278b1f3a7e1a3ec87f499d9aa43e8b8a96
Reviewed-on: https://code.wireshark.org/review/20890
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michal Labedzki 2016-11-24 10:50:46 +01:00 committed by Michael Mann
parent 386dd82bff
commit 7f32349815
3 changed files with 1149 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1256
epan/dissectors/packet-bthci_cmd.c
View File

File diff suppressed because it is too large Load Diff

15
epan/dissectors/packet-bthci_evt.c
View File

@ -783,7 +783,7 @@ static const value_string evt_amp_status[] = {
{ 0, NULL }
};
static const value_string evt_controller_types[] = {
const value_string bthci_evt_controller_types[] = {
{ 0x00, "Primary BR/EDR" },
{ 0x01, "802.11 AMP" },
{ 0, NULL }
@ -863,7 +863,7 @@ static const value_string evt_air_mode_vals[] = {
{ 0, NULL }
};
static const value_string mws_transport_layer_vals[] = {
const value_string bthci_evt_mws_transport_layer_vals[] = {
{ 0x00, "Disabled" },
{ 0x01, "WCI-1 Transport" },
{ 0x02, "WCI-2 Transport" },
@ -895,7 +895,7 @@ static const value_string event_type_vals[] = {
{ 0, NULL }
};
static const value_string codec_id_vals[] = {
const value_string bthci_evt_codec_id_vals[] = {
{ 0x00, "u-Law log" },
{ 0x01, "A-law log" },
{ 0x02, "CVSD" },
@ -6932,6 +6932,7 @@ proto_register_bthci_evt(void)
FT_UINT8, BASE_DEC, VALS(evt_enable_values), 0x0,
NULL, HFILL}
},
/* TODO: More detailed dissection */
{ &hf_bthci_evt_afh_channel_map,
{"AFH Channel Map", "bthci_evt.afh_channel_map",
FT_BYTES, BASE_NONE, NULL, 0x0,
@ -7084,7 +7085,7 @@ proto_register_bthci_evt(void)
},
{ &hf_bthci_evt_amp_controller_type,
{ "Controller Type", "bthci_evt.controller_type",
FT_UINT8, BASE_HEX, VALS(evt_controller_types), 0x0,
FT_UINT8, BASE_HEX, VALS(bthci_evt_controller_types), 0x0,
NULL, HFILL }
},
{ &hf_bthci_evt_pal_capabilities_00,
@ -7609,7 +7610,7 @@ proto_register_bthci_evt(void)
},
{ &hf_bthci_evt_mws_transport_layer,
{ "Transport Layer", "bthci_evt.mws.transport_layers.item.transport_layer",
FT_UINT8, BASE_HEX, VALS(mws_transport_layer_vals), 0x0,
FT_UINT8, BASE_HEX, VALS(bthci_evt_mws_transport_layer_vals), 0x0,
NULL, HFILL }
},
{ &hf_bthci_evt_mws_number_of_baud_rates,
@ -7784,11 +7785,11 @@ proto_register_bthci_evt(void)
},
{ &hf_bthci_evt_codec_id,
{ "Codec", "bthci_evt.codec_id",
FT_UINT8, BASE_HEX, VALS(codec_id_vals), 0x0,
FT_UINT8, BASE_HEX, VALS(bthci_evt_codec_id_vals), 0x0,
NULL, HFILL }
},
{ &hf_bthci_evt_vendor_codec_id,
{ "Codec", "bthci_evt.vendor_codecs.item.codec_id",
{ "Vendor Codec ID", "bthci_evt.vendor_codecs.item.codec_id",
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},

3
epan/dissectors/packet-bthci_evt.h
View File

@ -23,6 +23,9 @@
#define __PACKET_BTHCI_EVT_H__
extern value_string_ext bthci_evt_evt_code_vals_ext;
extern const value_string bthci_evt_controller_types[];
extern const value_string bthci_evt_codec_id_vals[];
extern const value_string bthci_evt_mws_transport_layer_vals[];
#ifdef __cplusplus
extern "C" {