diff options
| author | 2024-11-07 14:21:59 -0800 | |
|---|---|---|
| committer | 2024-11-08 09:51:41 -0800 | |
| commit | 0c2d0cd5d3a184450a993396f742b2f9fa519c68 (patch) | |
| tree | 7c9fef5f4bc731a744387aa5a0a647e4d42c56aa | |
| parent | 3ef7afd13f04f0d830415bf46e8e0c8934de2d3f (diff) | |
cpplint: fix and enable whitespace/blank_line
Bug: 364967694
Test: m .
Flag: Exempt refactor
Change-Id: Ic26c9b0305b76f66a461a4449845a8ca10726c36
63 files changed, 40 insertions, 110 deletions
diff --git a/CPPLINT.cfg b/CPPLINT.cfg index 61d9c70304..7693b8dc19 100644 --- a/CPPLINT.cfg +++ b/CPPLINT.cfg @@ -5,8 +5,6 @@ linelength=100 filter=-whitespace/indent # TODO: b/364967694 re-enable the warning -filter=-whitespace/blank_line -# TODO: b/364967694 re-enable the warning filter=-readability/check # TODO: b/364967694 re-enable the warning filter=-runtime/int diff --git a/system/bta/dm/bta_dm_disc_sdp.cc b/system/bta/dm/bta_dm_disc_sdp.cc index 8bdbc9ee8a..f4b1b13728 100644 --- a/system/bta/dm/bta_dm_disc_sdp.cc +++ b/system/bta/dm/bta_dm_disc_sdp.cc @@ -217,7 +217,6 @@ void bta_dm_sdp_result(tSDP_STATUS sdp_result, tBTA_DM_SDP_STATE* sdp_state) { } else { /* regular one service per search or PNP search */ break; } - } while (sdp_state->service_index <= BTA_MAX_SERVICE_ID); log::verbose("services_found = {:04x}", sdp_state->services_found); diff --git a/system/bta/dm/bta_dm_int.h b/system/bta/dm/bta_dm_int.h index fa382d11d8..d7757557dc 100644 --- a/system/bta/dm/bta_dm_int.h +++ b/system/bta/dm/bta_dm_int.h @@ -186,7 +186,6 @@ typedef struct { app_id, bta_sys_conn_status_text(state).c_str(), new_request ? "true" : "false"); } - } tBTA_DM_SRVCS; #ifndef BTA_DM_NUM_CONN_SRVS @@ -196,7 +195,6 @@ typedef struct { typedef struct { uint8_t count; tBTA_DM_SRVCS conn_srvc[BTA_DM_NUM_CONN_SRVS]; - } tBTA_DM_CONNECTED_SRVCS; typedef struct { @@ -257,7 +255,6 @@ typedef struct { uint16_t page_timeout; /* timeout for page in slots */ bool avoid_scatter; /* true to avoid scatternet when av is streaming (be the central) */ - } tBTA_DM_CFG; extern const uint32_t bta_service_id_to_btm_srv_id_lkup_tbl[]; @@ -266,7 +263,6 @@ typedef struct { uint8_t id; uint8_t app_id; uint8_t cfg; - } tBTA_DM_RM; extern const tBTA_DM_CFG* p_bta_dm_cfg; @@ -276,20 +272,17 @@ typedef struct { uint8_t id; uint8_t app_id; uint8_t spec_idx; /* index of spec table to use */ - } tBTA_DM_PM_CFG; typedef struct { tBTA_DM_PM_ACTION power_mode; uint16_t timeout; - } tBTA_DM_PM_ACTN; typedef struct { uint8_t allow_mask; /* mask of sniff/hold/park modes to allow */ uint8_t ssr; /* set SSR on conn open/unpark */ tBTA_DM_PM_ACTN actn_tbl[BTA_DM_PM_NUM_EVTS][2]; - } tBTA_DM_PM_SPEC; typedef struct { diff --git a/system/bta/gatt/bta_gattc_main.cc b/system/bta/gatt/bta_gattc_main.cc index 2912879e77..b4afcd542a 100644 --- a/system/bta/gatt/bta_gattc_main.cc +++ b/system/bta/gatt/bta_gattc_main.cc @@ -126,7 +126,6 @@ static const uint8_t bta_gattc_st_idle[][BTA_GATTC_NUM_COLS] = { /* BTA_GATTC_DISCOVER_CMPL_EVT */ {BTA_GATTC_IGNORE, BTA_GATTC_IDLE_ST}, /* BTA_GATTC_OP_CMPL_EVT */ {BTA_GATTC_IGNORE, BTA_GATTC_IDLE_ST}, /* BTA_GATTC_INT_DISCONN_EVT */ {BTA_GATTC_IGNORE, BTA_GATTC_IDLE_ST}, - }; /* state table for wait for open state */ @@ -153,7 +152,6 @@ static const uint8_t bta_gattc_st_w4_conn[][BTA_GATTC_NUM_COLS] = { /* BTA_GATTC_DISCOVER_CMPL_EVT */ {BTA_GATTC_IGNORE, BTA_GATTC_W4_CONN_ST}, /* BTA_GATTC_OP_CMPL_EVT */ {BTA_GATTC_IGNORE, BTA_GATTC_W4_CONN_ST}, /* BTA_GATTC_INT_DISCONN_EVT */ {BTA_GATTC_OPEN_FAIL, BTA_GATTC_IDLE_ST}, - }; /* state table for open state */ @@ -181,7 +179,6 @@ static const uint8_t bta_gattc_st_connected[][BTA_GATTC_NUM_COLS] = { /* BTA_GATTC_OP_CMPL_EVT */ {BTA_GATTC_OP_CMPL, BTA_GATTC_CONN_ST}, /* BTA_GATTC_INT_DISCONN_EVT */ {BTA_GATTC_CLOSE, BTA_GATTC_IDLE_ST}, - }; /* state table for discover state */ @@ -209,7 +206,6 @@ static const uint8_t bta_gattc_st_discover[][BTA_GATTC_NUM_COLS] = { /* BTA_GATTC_OP_CMPL_EVT */ {BTA_GATTC_OP_CMPL_DURING_DISCOVERY, BTA_GATTC_DISCOVER_ST}, /* BTA_GATTC_INT_DISCONN_EVT */ {BTA_GATTC_CLOSE, BTA_GATTC_IDLE_ST}, - }; /* type for state table */ diff --git a/system/bta/hf_client/bta_hf_client_at.h b/system/bta/hf_client/bta_hf_client_at.h index e4d4b2342e..8ac789fdc5 100644 --- a/system/bta/hf_client/bta_hf_client_at.h +++ b/system/bta/hf_client/bta_hf_client_at.h @@ -59,5 +59,4 @@ typedef struct { so when their values come later, we know which value in sequence match certain indicator */ int indicator_lookup[BTA_HF_CLIENT_AT_INDICATOR_COUNT]; - } tBTA_HF_CLIENT_AT_CB; diff --git a/system/bta/hf_client/bta_hf_client_int.h b/system/bta/hf_client/bta_hf_client_int.h index f9314633e3..4f560e762e 100644 --- a/system/bta/hf_client/bta_hf_client_int.h +++ b/system/bta/hf_client/bta_hf_client_int.h @@ -149,7 +149,6 @@ typedef union { tBTA_HF_CLIENT_DISC_RESULT disc_result; tBTA_HF_CLIENT_RFC rfc; tBTA_HF_CLIENT_DATA_VAL val; - } tBTA_HF_CLIENT_DATA; /* First handle for the control block */ diff --git a/system/bta/hh/bta_hh_int.h b/system/bta/hh/bta_hh_int.h index c897c2105b..2f9f502ba9 100644 --- a/system/bta/hh/bta_hh_int.h +++ b/system/bta/hh/bta_hh_int.h @@ -71,7 +71,6 @@ enum { BTA_HH_W4_SEC, BTA_HH_INVALID_ST /* Used to check invalid states before executing SM function */ - }; typedef uint8_t tBTA_HH_STATE; diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h index 8772fe183c..fbdf277df4 100644 --- a/system/bta/include/bta_api.h +++ b/system/bta/include/bta_api.h @@ -129,7 +129,6 @@ inline std::string preferred_role_text(const tBTA_PREF_ROLES& role) { } enum { - BTA_DM_NO_SCATTERNET, /* Device doesn't support scatternet, it might support "role switch during connection" for an incoming connection, when it already has @@ -139,7 +138,6 @@ enum { Peripheral roles for short period of time */ BTA_DM_FULL_SCATTERNET /* Device can have simultaneous connection in central and peripheral roles */ - }; typedef struct { diff --git a/system/bta/include/bta_hh_api.h b/system/bta/include/bta_hh_api.h index 506cea6583..e59f80a8b7 100644 --- a/system/bta/include/bta_hh_api.h +++ b/system/bta/include/bta_hh_api.h @@ -318,7 +318,6 @@ typedef struct { BT_HDR* p_rpt_data; /* GET_RPT_EVT : report data */ uint8_t idle_rate; /* GET_IDLE_EVT : idle rate */ } rsp_data; - } tBTA_HH_HSDATA; /* union of data associated with HD callback */ diff --git a/system/bta/include/bta_pan_api.h b/system/bta/include/bta_pan_api.h index ad7f116786..bd4a00cc50 100644 --- a/system/bta/include/bta_pan_api.h +++ b/system/bta/include/bta_pan_api.h @@ -68,7 +68,6 @@ typedef struct { typedef struct { RawAddress bd_addr; /* BD address of peer device. */ uint16_t handle; /* Handle associated with this connection. */ - } tBTA_PAN_OPENING; /* Event associated with BTA_PAN_OPEN_EVT */ @@ -78,7 +77,6 @@ typedef struct { tBTA_PAN_STATUS status; /* status of open event */ tBTA_PAN_ROLE local_role; /* Local device PAN role for the connection */ tBTA_PAN_ROLE peer_role; /* Peer device PAN role for the connection */ - } tBTA_PAN_OPEN; /* Event associated with BTA_PAN_CLOSE_EVT */ diff --git a/system/bta/le_audio/broadcaster/broadcaster.cc b/system/bta/le_audio/broadcaster/broadcaster.cc index 251091a8b4..782e5826f9 100644 --- a/system/bta/le_audio/broadcaster/broadcaster.cc +++ b/system/bta/le_audio/broadcaster/broadcaster.cc @@ -889,7 +889,6 @@ public: log::assert_that(broadcasts_.count(broadcast_id) != 0, "assert failed: broadcasts_.count(broadcast_id) != 0"); broadcasts_[broadcast_id]->HandleHciEvent(HCI_BLE_CREATE_BIG_CPL_EVT, evt); - } break; case bluetooth::hci::iso_manager::kIsoEventBigOnTerminateCmpl: { auto* evt = static_cast<big_terminate_cmpl_evt*>(data); diff --git a/system/bta/le_audio/state_machine.cc b/system/bta/le_audio/state_machine.cc index cc9f843f04..695348fdbc 100644 --- a/system/bta/le_audio/state_machine.cc +++ b/system/bta/le_audio/state_machine.cc @@ -1687,7 +1687,6 @@ private: leAudioDevice->address_, BT_TRANSPORT_LE); conn_pairs.push_back({.cis_conn_handle = ase->cis_conn_hdl, .acl_conn_handle = acl_handle}); log::debug("cis handle: {} acl handle : 0x{:x}", ase->cis_conn_hdl, acl_handle); - } while ((ase = leAudioDevice->GetNextActiveAse(ase))); } while ((leAudioDevice = group->GetNextActiveDevice(leAudioDevice))); @@ -2416,7 +2415,6 @@ private: msg_stream << "ASE_ID " << +ase->id << ","; extra_stream << "meta: " << base::HexEncode(conf.metadata.data(), conf.metadata.size()) << ";;"; - } while ((ase = leAudioDevice->GetNextActiveAse(ase))); bluetooth::le_audio::client_parser::ascs::PrepareAseCtpEnable(confs, value); diff --git a/system/bta/pan/bta_pan_int.h b/system/bta/pan/bta_pan_int.h index 09781f4269..dd9e154228 100644 --- a/system/bta/pan/bta_pan_int.h +++ b/system/bta/pan/bta_pan_int.h @@ -101,7 +101,6 @@ typedef struct { typedef struct { BT_HDR_RIGID hdr; /* Event header */ tPAN_RESULT result; - } tBTA_PAN_CONN; /* pan data param */ @@ -112,7 +111,6 @@ typedef struct { uint16_t protocol; bool ext; bool forward; - } tBTA_PAN_DATA_PARAMS; /* union of all data types */ @@ -139,7 +137,6 @@ typedef struct { tBTA_PAN_ROLE local_role; /* local role */ tBTA_PAN_ROLE peer_role; /* peer role */ uint8_t app_id; /* application id for the connection */ - } tBTA_PAN_SCB; /* main control block */ @@ -149,7 +146,6 @@ typedef struct { uint8_t app_id[3]; /* application id for PAN roles */ uint8_t flow_mask; /* Data flow mask */ uint8_t q_level; /* queue level set by application for TX data */ - } tBTA_PAN_CB; /***************************************************************************** diff --git a/system/bta/pan/bta_pan_main.cc b/system/bta/pan/bta_pan_main.cc index 91652e596a..249b3c01cb 100644 --- a/system/bta/pan/bta_pan_main.cc +++ b/system/bta/pan/bta_pan_main.cc @@ -56,7 +56,6 @@ typedef void (*tBTA_PAN_ACTION)(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); const tBTA_PAN_ACTION bta_pan_action[] = { bta_pan_api_close, bta_pan_tx_path, bta_pan_rx_path, bta_pan_tx_flow, bta_pan_write_buf, bta_pan_conn_open, bta_pan_conn_close, bta_pan_free_buf, - }; /* state table information */ @@ -75,8 +74,7 @@ const uint8_t bta_pan_st_idle[][BTA_PAN_NUM_COLS] = { /* PAN_CONN_OPEN */ {BTA_PAN_CONN_OPEN, BTA_PAN_OPEN_ST}, /* PAN_CONN_CLOSE */ {BTA_PAN_CONN_OPEN, BTA_PAN_IDLE_ST}, /* FLOW_ENABLE */ {BTA_PAN_IGNORE, BTA_PAN_IDLE_ST}, - /* BNEP_DATA */ {BTA_PAN_IGNORE, BTA_PAN_IDLE_ST} - + /* BNEP_DATA */ {BTA_PAN_IGNORE, BTA_PAN_IDLE_ST}, }; /* state table for open state */ @@ -90,7 +88,8 @@ const uint8_t bta_pan_st_open[][BTA_PAN_NUM_COLS] = { /* PAN_CONN_OPEN */ {BTA_PAN_IGNORE, BTA_PAN_OPEN_ST}, /* PAN_CONN_CLOSE */ {BTA_PAN_CONN_CLOSE, BTA_PAN_IDLE_ST}, /* FLOW_ENABLE */ {BTA_PAN_RX_PATH, BTA_PAN_OPEN_ST}, - /* BNEP_DATA */ {BTA_PAN_TX_PATH, BTA_PAN_OPEN_ST}}; + /* BNEP_DATA */ {BTA_PAN_TX_PATH, BTA_PAN_OPEN_ST}, +}; /* state table for closing state */ const uint8_t bta_pan_st_closing[][BTA_PAN_NUM_COLS] = { @@ -103,7 +102,8 @@ const uint8_t bta_pan_st_closing[][BTA_PAN_NUM_COLS] = { /* PAN_CONN_OPEN */ {BTA_PAN_IGNORE, BTA_PAN_CLOSING_ST}, /* PAN_CONN_CLOSE */ {BTA_PAN_CONN_CLOSE, BTA_PAN_IDLE_ST}, /* FLOW_ENABLE */ {BTA_PAN_RX_PATH, BTA_PAN_CLOSING_ST}, - /* BNEP_DATA */ {BTA_PAN_TX_PATH, BTA_PAN_CLOSING_ST}}; + /* BNEP_DATA */ {BTA_PAN_TX_PATH, BTA_PAN_CLOSING_ST}, +}; /* type for state table */ typedef const uint8_t (*tBTA_PAN_ST_TBL)[BTA_PAN_NUM_COLS]; diff --git a/system/bta/pb/bta_pbs_int.h b/system/bta/pb/bta_pbs_int.h index 4a06199983..5807ac15f5 100644 --- a/system/bta/pb/bta_pbs_int.h +++ b/system/bta/pb/bta_pbs_int.h @@ -53,7 +53,6 @@ typedef struct { (Server only) */ uint8_t supported_features; /* Server supported features */ uint8_t supported_repositories; /* Server supported repositories */ - } tBTA_PBS_CFG; #endif /* BTA_PBS_INT_H */ diff --git a/system/bta/sys/bta_sys_int.h b/system/bta/sys/bta_sys_int.h index 7f37764fc5..5d0b4755ae 100644 --- a/system/bta/sys/bta_sys_int.h +++ b/system/bta/sys/bta_sys_int.h @@ -61,7 +61,6 @@ typedef struct { tBTA_SYS_SSR_CFG_CBACK* p_ssr_cb; /* VS event handler */ tBTA_SYS_VS_EVT_HDLR* p_vs_evt_hdlr; - } tBTA_SYS_CB; /***************************************************************************** diff --git a/system/bta/test/gatt/database_test.cc b/system/bta/test/gatt/database_test.cc index e6f6075d10..3b50d860ae 100644 --- a/system/bta/test/gatt/database_test.cc +++ b/system/bta/test/gatt/database_test.cc @@ -539,5 +539,4 @@ TEST(GattDatabaseTest, serialized_hash_test) { EXPECT_EQ(db_from_disk.Hash(), db_from_serialized.Hash()); } - } // namespace gatt diff --git a/system/btif/co/bta_pan_co.cc b/system/btif/co/bta_pan_co.cc index 0bdcae371e..558149239d 100644 --- a/system/btif/co/bta_pan_co.cc +++ b/system/btif/co/bta_pan_co.cc @@ -139,7 +139,6 @@ void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id) { p_buf->len, ext, forward); osi_free(p_buf); } - } while (p_buf != NULL); } diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc index 102242545b..96eb33f5c2 100644 --- a/system/btif/src/btif_dm.cc +++ b/system/btif/src/btif_dm.cc @@ -196,7 +196,6 @@ typedef struct { Octet16 er; bool is_id_keys_rcvd; btif_dm_local_key_id_t id_keys; /* ID kyes */ - } btif_dm_local_key_cb_t; /* this structure holds optional OOB data for remote device */ diff --git a/system/common/base_bind_unittest.cc b/system/common/base_bind_unittest.cc index b4f35f53e4..7a7530bdc3 100644 --- a/system/common/base_bind_unittest.cc +++ b/system/common/base_bind_unittest.cc @@ -36,7 +36,6 @@ struct Vars { int c{0}; bool operator==(const Vars& rhs) const { return a == rhs.a && b == rhs.b && c == rhs.c; } - } g_vars; void func() {} diff --git a/system/device/include/interop.h b/system/device/include/interop.h index 1d520b0c08..e5623f1936 100644 --- a/system/device/include/interop.h +++ b/system/device/include/interop.h @@ -31,7 +31,6 @@ static const char INTEROP_MODULE[] = "interop_module"; // Only add values at the end of this enum and before END_OF_INTEROP_LIST // do NOT delete values as they may be used in dynamic device configuration. typedef enum { - BEGINNING_OF_INTEROP_LIST = 0, // Disable secure connections // This is for pre BT 4.1/2 devices that do not handle secure mode diff --git a/system/device/src/interop.cc b/system/device/src/interop.cc index c45031a7b0..344198f2ea 100644 --- a/system/device/src/interop.cc +++ b/system/device/src/interop.cc @@ -179,7 +179,6 @@ typedef struct { interop_lmp_version_t lmp_version_entry; interop_addr_range_entry_t addr_range_entry; } entry_type; - } interop_db_entry_t; namespace fmt { diff --git a/system/device/test/device_iot_config_test.cc b/system/device/test/device_iot_config_test.cc index 58bc3a3425..57229e6f5b 100644 --- a/system/device/test/device_iot_config_test.cc +++ b/system/device/test/device_iot_config_test.cc @@ -908,7 +908,6 @@ TEST_F_WITH_FLAGS(DeviceIotConfigTest, test_device_iot_config_sections_sort_by_e .key = "a", }, }}, - }; device_iot_config_sections_sort_by_entry_key(conf, [](const entry_t& first, const entry_t& second) { diff --git a/system/embdrv/sbc/decoder/include/oi_bt_spec.h b/system/embdrv/sbc/decoder/include/oi_bt_spec.h index c0091cbe73..26c8d18aef 100644 --- a/system/embdrv/sbc/decoder/include/oi_bt_spec.h +++ b/system/embdrv/sbc/decoder/include/oi_bt_spec.h @@ -140,7 +140,6 @@ typedef enum { OI_LINK_KEY_TYPE_UNAUTHENTICATED = 4, /* Unauthenticated */ OI_LINK_KEY_TYPE_AUTHENTICATED = 5, /* Authenticated */ OI_LINK_KEY_TYPE_CHANGED_COMBO = 6 /* Changed */ - } OI_BT_LINK_KEY_TYPE; /* Number of bytes allocated for a PIN (personal indentification number) */ diff --git a/system/embdrv/sbc/decoder/include/oi_status.h b/system/embdrv/sbc/decoder/include/oi_status.h index 28d9f04f0a..b91809f564 100644 --- a/system/embdrv/sbc/decoder/include/oi_status.h +++ b/system/embdrv/sbc/decoder/include/oi_status.h @@ -684,7 +684,6 @@ typedef enum { status. (Only to be used for special cases involving OI_SLOG_ERROR() and OI_SLOG_WARNING().) */ - } OI_STATUS; /* Remember to update the #define below when new reserved blocks are added to diff --git a/system/embdrv/sbc/encoder/include/sbc_encoder.h b/system/embdrv/sbc/encoder/include/sbc_encoder.h index 4c8d2c6fb4..d225b5d19e 100644 --- a/system/embdrv/sbc/encoder/include/sbc_encoder.h +++ b/system/embdrv/sbc/encoder/include/sbc_encoder.h @@ -186,7 +186,6 @@ typedef struct SBC_ENC_PARAMS_TAG { uint16_t FrameHeader; uint8_t Format; /* Default to be SBC_FORMAT_GENERAL for SBC if not assigned. Assigning to SBC_FORMAT_MSBC for mSBC */ - } SBC_ENC_PARAMS; #ifdef __cplusplus diff --git a/system/gd/hci/acl_manager/le_impl.h b/system/gd/hci/acl_manager/le_impl.h index 8020dfc47e..a8936a95d2 100644 --- a/system/gd/hci/acl_manager/le_impl.h +++ b/system/gd/hci/acl_manager/le_impl.h @@ -298,7 +298,6 @@ private: } return false; } - } connections; public: diff --git a/system/gd/metrics/chromeos/metrics_allowlist.cc b/system/gd/metrics/chromeos/metrics_allowlist.cc index 1beb3c80a4..33f2bf6dde 100644 --- a/system/gd/metrics/chromeos/metrics_allowlist.cc +++ b/system/gd/metrics/chromeos/metrics_allowlist.cc @@ -182,7 +182,6 @@ static constexpr int device_info_allow_list_usb[][2] = { {12994, 1}, /* Fuji Yusoki Kogyo Co., Ltd. */ {44580, 34328}, - }; enum Transport { diff --git a/system/gd/metrics/chromeos/metrics_event.h b/system/gd/metrics/chromeos/metrics_event.h index 039cf84944..56d059a853 100644 --- a/system/gd/metrics/chromeos/metrics_event.h +++ b/system/gd/metrics/chromeos/metrics_event.h @@ -110,7 +110,6 @@ enum class MetricProfileConnectionStatus : int64_t { PROFILE_CONN_STATE_REMOTE_UNAVAILABLE = 6, PROFILE_CONN_STATE_PROFILE_NOT_SUPPORTED = 7, PROFILE_CONN_STATE_UNKNOWN_ERROR = 8, - }; // ENUM definition for profile disconnection status that in sync with ChromeOS structured metrics diff --git a/system/hci/include/bt_vendor_lib.h b/system/hci/include/bt_vendor_lib.h index c666fc13bf..1f774d4bb7 100644 --- a/system/hci/include/bt_vendor_lib.h +++ b/system/hci/include/bt_vendor_lib.h @@ -197,7 +197,6 @@ typedef enum { * completion of vendor specific setup process once it has been done. */ BT_VND_OP_A2DP_OFFLOAD_STOP, - } bt_vendor_opcode_t; /** Power on/off control states */ diff --git a/system/hci/src/packet_fragmenter.cc b/system/hci/src/packet_fragmenter.cc index c95c25dfe6..0077237c19 100644 --- a/system/hci/src/packet_fragmenter.cc +++ b/system/hci/src/packet_fragmenter.cc @@ -312,9 +312,12 @@ static void reassemble_and_dispatch(BT_HDR* packet) { } } -static const packet_fragmenter_t interface = {init, cleanup, - - fragment_and_dispatch, reassemble_and_dispatch}; +static const packet_fragmenter_t interface = { + init, + cleanup, + fragment_and_dispatch, + reassemble_and_dispatch, +}; const packet_fragmenter_t* packet_fragmenter_get_interface() { buffer_allocator = buffer_allocator_get_interface(); diff --git a/system/include/hardware/bluetooth.h b/system/include/hardware/bluetooth.h index 77ff10a999..d1d7b9bc2b 100644 --- a/system/include/hardware/bluetooth.h +++ b/system/include/hardware/bluetooth.h @@ -993,7 +993,6 @@ typedef struct { /** check if pbap pse dynamic version upgrade is enable */ bool (*pbap_pse_dynamic_version_upgrade_is_enabled)(); - } bt_interface_t; #define BLUETOOTH_INTERFACE_STRING "bluetoothInterface" diff --git a/system/include/hardware/bt_gatt_client.h b/system/include/hardware/bt_gatt_client.h index f6c4daeca8..14d9f3d17e 100644 --- a/system/include/hardware/bt_gatt_client.h +++ b/system/include/hardware/bt_gatt_client.h @@ -291,7 +291,6 @@ typedef struct { /** Request a BLE subrate request procedure */ bt_status_t (*subrate_request)(const RawAddress& bd_addr, int subrate_min, int subrate_max, int max_latency, int cont_num, int timeout); - } btgatt_client_interface_t; __END_DECLS diff --git a/system/include/hardware/bt_gatt_server.h b/system/include/hardware/bt_gatt_server.h index c83b2c9a4b..f6b091c98e 100644 --- a/system/include/hardware/bt_gatt_server.h +++ b/system/include/hardware/bt_gatt_server.h @@ -172,7 +172,6 @@ typedef struct { bt_status_t (*read_phy)(const RawAddress& bd_addr, base::Callback<void(uint8_t tx_phy, uint8_t rx_phy, uint8_t status)> cb); - } btgatt_server_interface_t; __END_DECLS diff --git a/system/include/hardware/bt_hd.h b/system/include/hardware/bt_hd.h index b570656b8c..fd0605e4a6 100644 --- a/system/include/hardware/bt_hd.h +++ b/system/include/hardware/bt_hd.h @@ -112,7 +112,6 @@ typedef struct { /** send Virtual Cable Unplug */ bt_status_t (*virtual_cable_unplug)(void); - } bthd_interface_t; __END_DECLS diff --git a/system/include/hardware/bt_hf_client.h b/system/include/hardware/bt_hf_client.h index 4bf24c0bab..7905f24576 100644 --- a/system/include/hardware/bt_hf_client.h +++ b/system/include/hardware/bt_hf_client.h @@ -75,7 +75,6 @@ typedef enum { BTHF_CLIENT_CALLSETUP_INCOMING, BTHF_CLIENT_CALLSETUP_OUTGOING, BTHF_CLIENT_CALLSETUP_ALERTING - } bthf_client_callsetup_t; typedef enum { diff --git a/system/include/hardware/bt_hh.h b/system/include/hardware/bt_hh.h index cd6079fc16..19185880a6 100644 --- a/system/include/hardware/bt_hh.h +++ b/system/include/hardware/bt_hh.h @@ -161,7 +161,6 @@ typedef struct { bthh_get_report_callback get_report_cb; bthh_virtual_unplug_callback virtual_unplug_cb; bthh_handshake_callback handshake_cb; - } bthh_callbacks_t; /** Represents the standard BT-HH interface. */ @@ -227,7 +226,6 @@ typedef struct { /** Configure which profiles can be enabled. Affected after re-init */ void (*configure_enabled_profiles)(bool enable_hidp, bool enable_hogp); - } bthh_interface_t; __END_DECLS diff --git a/system/include/hardware/bt_le_audio.h b/system/include/hardware/bt_le_audio.h index fea9dd4f57..47f15b59ad 100644 --- a/system/include/hardware/bt_le_audio.h +++ b/system/include/hardware/bt_le_audio.h @@ -298,7 +298,6 @@ typedef struct btle_audio_codec_config { ", frame duration: " + frame_duration_str + ", octets per frame: " + octets_per_frame_str + ", codec priroty: " + codec_priority_str; } - } btle_audio_codec_config_t; class LeAudioClientCallbacks { diff --git a/system/include/hardware/bt_pan.h b/system/include/hardware/bt_pan.h index 4eca93720e..47693ec2db 100644 --- a/system/include/hardware/bt_pan.h +++ b/system/include/hardware/bt_pan.h @@ -81,7 +81,6 @@ typedef struct { * Cleanup the pan interface */ void (*cleanup)(void); - } btpan_interface_t; namespace fmt { diff --git a/system/include/hardware/bt_sock.h b/system/include/hardware/bt_sock.h index 4755cef5f8..dbc3024d37 100644 --- a/system/include/hardware/bt_sock.h +++ b/system/include/hardware/bt_sock.h @@ -118,7 +118,6 @@ typedef struct { * Get L2CAP remote channel ID with the associated connection uuid. */ bt_status_t (*get_l2cap_remote_cid)(bluetooth::Uuid& conn_uuid, uint16_t* cid); - } btsock_interface_t; __END_DECLS diff --git a/system/profile/avrcp/connection_handler.cc b/system/profile/avrcp/connection_handler.cc index 9608294161..146c079c77 100644 --- a/system/profile/avrcp/connection_handler.cc +++ b/system/profile/avrcp/connection_handler.cc @@ -295,7 +295,6 @@ void ConnectionHandler::InitiatorControlCb(uint8_t handle, uint8_t event, uint16 instance_->vol_->DeviceConnected(newDevice->GetAddress()); } } - } break; case AVRC_CLOSE_IND_EVT: { diff --git a/system/profile/avrcp/device.cc b/system/profile/avrcp/device.cc index 3167363ca7..0201858318 100644 --- a/system/profile/avrcp/device.cc +++ b/system/profile/avrcp/device.cc @@ -782,7 +782,6 @@ void Device::GetElementAttributesResponse(uint8_t label, } } } else { // zero attributes requested which means all attributes requested - if (!com::android::bluetooth::flags::get_all_element_attributes_empty()) { for (const auto& attribute : info.attributes) { response->AddAttributeEntry(attribute); diff --git a/system/stack/a2dp/a2dp_api.cc b/system/stack/a2dp/a2dp_api.cc index 574eb16d07..f0ecdf0e9d 100644 --- a/system/stack/a2dp/a2dp_api.cc +++ b/system/stack/a2dp/a2dp_api.cc @@ -139,7 +139,6 @@ static void a2dp_sdp_cback(const RawAddress& /* bd_addr */, tSDP_STATUS status) /* we've got everything, we're done */ found = true; break; - } while (true); } diff --git a/system/stack/a2dp/a2dp_sbc_up_sample.cc b/system/stack/a2dp/a2dp_sbc_up_sample.cc index a3fc893028..1c99283606 100644 --- a/system/stack/a2dp/a2dp_sbc_up_sample.cc +++ b/system/stack/a2dp/a2dp_sbc_up_sample.cc @@ -234,7 +234,6 @@ int a2dp_sbc_up_sample_16m(void* p_src, void* p_dst, uint32_t src_samples, uint3 a2dp_sbc_ups_cb.cur_pos -= src_sps; dst_samples--; dst_samples--; - } while (a2dp_sbc_ups_cb.cur_pos > 0 && dst_samples); a2dp_sbc_ups_cb.cur_pos += dst_sps; @@ -362,7 +361,6 @@ int a2dp_sbc_up_sample_8m(void* p_src, void* p_dst, uint32_t src_samples, uint32 a2dp_sbc_ups_cb.cur_pos -= src_sps; dst_samples -= 4; - } while (a2dp_sbc_ups_cb.cur_pos > 0 && dst_samples); a2dp_sbc_ups_cb.cur_pos += dst_sps; diff --git a/system/stack/avdt/avdt_ccb_act.cc b/system/stack/avdt/avdt_ccb_act.cc index 05e064f230..1784f1b972 100644 --- a/system/stack/avdt/avdt_ccb_act.cc +++ b/system/stack/avdt/avdt_ccb_act.cc @@ -659,7 +659,6 @@ void avdt_ccb_clear_cmds(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* /* p_data */) { /* set up next message */ p_ccb->p_curr_cmd = (BT_HDR*)fixed_queue_try_dequeue(p_ccb->cmd_q); - } while (p_ccb->p_curr_cmd != NULL); /* send a CC_CLOSE_EVT any active scbs associated with this ccb */ diff --git a/system/stack/bnep/bnep_api.cc b/system/stack/bnep/bnep_api.cc index 51e4f51641..d717835eee 100644 --- a/system/stack/bnep/bnep_api.cc +++ b/system/stack/bnep/bnep_api.cc @@ -389,7 +389,6 @@ tBNEP_RESULT BNEP_WriteBuf(uint16_t handle, const RawAddress& dest_addr, BT_HDR* osi_free(p_buf); return BNEP_IGNORE_CMD; } - } while (ext & 0x80); if (protocol != BNEP_802_1_P_PROTOCOL) { @@ -494,7 +493,6 @@ tBNEP_RESULT BNEP_Write(uint16_t handle, const RawAddress& dest_addr, uint8_t* p if (new_len > org_len) { return BNEP_IGNORE_CMD; } - } while (ext & 0x80); if (protocol != BNEP_802_1_P_PROTOCOL) { diff --git a/system/stack/bnep/bnep_int.h b/system/stack/bnep/bnep_int.h index fde1a97d7b..0b740dae7d 100644 --- a/system/stack/bnep/bnep_int.h +++ b/system/stack/bnep/bnep_int.h @@ -135,7 +135,6 @@ typedef struct { bluetooth::Uuid prv_dst_uuid; bluetooth::Uuid src_uuid; bluetooth::Uuid dst_uuid; - } tBNEP_CONN; /* The main BNEP control block @@ -155,7 +154,6 @@ typedef struct { tL2CAP_APPL_INFO reg_info; bool profile_registered; /* true when we got our BD addr */ - } tBNEP_CB; /* Global BNEP data diff --git a/system/stack/bnep/bnep_utils.cc b/system/stack/bnep/bnep_utils.cc index 252facf668..daa96a26ad 100644 --- a/system/stack/bnep/bnep_utils.cc +++ b/system/stack/bnep/bnep_utils.cc @@ -1203,7 +1203,6 @@ tBNEP_RESULT bnep_is_packet_allowed(tBNEP_CONN* p_bcb, const RawAddress& dest_ad p_data += len; new_len += (len + 2); - } while (ext & 0x80); } if ((new_len + 4) > org_len) { diff --git a/system/stack/btm/btm_ble_gap.cc b/system/stack/btm/btm_ble_gap.cc index 25ace16aca..91ca0b6fe6 100644 --- a/system/stack/btm/btm_ble_gap.cc +++ b/system/stack/btm/btm_ble_gap.cc @@ -359,7 +359,6 @@ const uint8_t btm_le_state_combo_tbl[BTM_BLE_STATE_MAX][BTM_BLE_STATE_MAX] = { HCI_LE_STATES_PASS_SCAN_INIT_BIT, /* passive scan */ HCI_LE_STATES_ACTIVE_SCAN_INIT_BIT, /* active scan */ HCI_LE_STATES_SCAN_ADV_INIT_BIT /* scanable adv */ - }, { /* central */ @@ -373,7 +372,6 @@ const uint8_t btm_le_state_combo_tbl[BTM_BLE_STATE_MAX][BTM_BLE_STATE_MAX] = { HCI_LE_STATES_PASS_SCAN_CENTRAL_BIT, /* passive scan */ HCI_LE_STATES_ACTIVE_SCAN_CENTRAL_BIT, /* active scan */ HCI_LE_STATES_SCAN_ADV_CENTRAL_BIT /* scanable adv */ - }, { /* peripheral */ @@ -387,7 +385,6 @@ const uint8_t btm_le_state_combo_tbl[BTM_BLE_STATE_MAX][BTM_BLE_STATE_MAX] = { HCI_LE_STATES_PASS_SCAN_PERIPHERAL_BIT, /* passive scan */ HCI_LE_STATES_ACTIVE_SCAN_PERIPHERAL_BIT, /* active scan */ HCI_LE_STATES_SCAN_ADV_PERIPHERAL_BIT /* scanable adv */ - }, { /* lo duty cycle adv */ diff --git a/system/stack/btm/btm_sco.h b/system/stack/btm/btm_sco.h index 4b51ce7eb4..8fe2876c56 100644 --- a/system/stack/btm/btm_sco.h +++ b/system/stack/btm/btm_sco.h @@ -255,7 +255,6 @@ public: bool is_orig; /* true if the originator */ bool rem_bd_known; /* true if remote BD addr known */ - } tSCO_CONN; /* SCO Management control block */ diff --git a/system/stack/btm/security_device_record.h b/system/stack/btm/security_device_record.h index 39cff8cbc0..e6608903a4 100644 --- a/system/stack/btm/security_device_record.h +++ b/system/stack/btm/security_device_record.h @@ -41,7 +41,6 @@ typedef struct { uint16_t max_conn_int; uint16_t peripheral_latency; uint16_t supervision_tout; - } tBTM_LE_CONN_PRAMS; /* The MSB of the clock offset field indicates whether the offset is valid. */ diff --git a/system/stack/hid/hidh_conn.cc b/system/stack/hid/hidh_conn.cc index 5205b322df..4b6165bc71 100644 --- a/system/stack/hid/hidh_conn.cc +++ b/system/stack/hid/hidh_conn.cc @@ -832,7 +832,6 @@ tHID_STATUS hidh_conn_snd_data(uint8_t dhandle, uint8_t trans_type, uint8_t para trans_type = HID_TRANS_DATAC; blank_datc = true; } - } while ((data_size != 0) || blank_datc); return HID_SUCCESS; diff --git a/system/stack/include/bnep_api.h b/system/stack/include/bnep_api.h index a11ce06218..2637cadb80 100644 --- a/system/stack/include/bnep_api.h +++ b/system/stack/include/bnep_api.h @@ -70,7 +70,6 @@ enum { BNEP_IGNORE_CMD, /* To ignore the rcvd command */ BNEP_TX_FLOW_ON, /* tx data flow enabled */ BNEP_TX_FLOW_OFF /* tx data flow disabled */ - }; typedef uint8_t tBNEP_RESULT; @@ -171,7 +170,6 @@ typedef struct { tBNEP_TX_DATA_FLOW_CB* p_tx_data_flow_cb; /* data flow callback */ tBNEP_FILTER_IND_CB* p_filter_ind_cb; /* To indicate that peer set protocol filters */ tBNEP_MFILTER_IND_CB* p_mfilter_ind_cb; /* To indicate that peer set mcast filters */ - } tBNEP_REGISTER; /***************************************************************************** diff --git a/system/stack/include/btm_ble_sec_api_types.h b/system/stack/include/btm_ble_sec_api_types.h index 6d750a7835..e1d1bc4e6e 100644 --- a/system/stack/include/btm_ble_sec_api_types.h +++ b/system/stack/include/btm_ble_sec_api_types.h @@ -104,7 +104,6 @@ typedef struct { Octet16 ir; Octet16 irk; Octet16 dhk; - } tBTM_BLE_LOCAL_ID_KEYS; typedef union { diff --git a/system/stack/include/gap_api.h b/system/stack/include/gap_api.h index 04329fdd9e..e4a185eefe 100644 --- a/system/stack/include/gap_api.h +++ b/system/stack/include/gap_api.h @@ -103,7 +103,6 @@ typedef union { uint16_t icon; uint8_t* p_dev_name; uint8_t addr_resolution; - } tGAP_BLE_ATTR_VALUE; typedef void(tGAP_BLE_CMPL_CBACK)(bool status, const RawAddress& addr, uint16_t length, diff --git a/system/stack/include/gatt_api.h b/system/stack/include/gatt_api.h index 54ecfdccb3..804d6390a2 100644 --- a/system/stack/include/gatt_api.h +++ b/system/stack/include/gatt_api.h @@ -279,7 +279,6 @@ typedef enum : uint16_t { GATT_CONN_TERMINATED_POWER_OFF = HCI_ERR_REMOTE_POWER_OFF, BTA_GATT_CONN_NONE = 0x0101, /* 0x0101 no connection to cancel */ - } tGATT_DISCONN_REASON; inline std::string gatt_disconnection_reason_text(const tGATT_DISCONN_REASON& reason) { @@ -502,7 +501,6 @@ typedef union { tGATT_VALUE attr_value; /* READ, HANDLE_VALUE_IND, PREPARE_WRITE */ /* READ_BLOB, READ_BY_TYPE */ uint16_t handle; /* WRITE, WRITE_BLOB */ - } tGATTS_RSP; #define GATT_PREP_WRITE_CANCEL 0x00 diff --git a/system/stack/include/sdp_api.h b/system/stack/include/sdp_api.h index 987a449a89..f639b107f7 100644 --- a/system/stack/include/sdp_api.h +++ b/system/stack/include/sdp_api.h @@ -562,7 +562,6 @@ struct tSdpApi { [[nodiscard]] tSDP_STATUS (*SDP_GetDiRecord)(uint8_t getRecordIndex, tSDP_DI_GET_RECORD* device_info, const tSDP_DISCOVERY_DB* p_db); - } device_id; }; diff --git a/system/stack/include/srvc_api.h b/system/stack/include/srvc_api.h index 43a24e1437..2e22ba49c1 100644 --- a/system/stack/include/srvc_api.h +++ b/system/stack/include/srvc_api.h @@ -59,7 +59,6 @@ typedef struct { uint16_t product_id; uint16_t product_version; uint8_t vendor_id_src; - } tDIS_PNP_ID; typedef union { @@ -106,7 +105,6 @@ typedef struct { tBA_LEVEL_DESCR ba_level_descr; tBT_TRANSPORT transport; tBA_CBACK* p_cback; - } tBA_REG_INFO; typedef union { diff --git a/system/stack/pan/pan_int.h b/system/stack/pan/pan_int.h index 6a65cdf5ad..f64f2ae6a7 100644 --- a/system/stack/pan/pan_int.h +++ b/system/stack/pan/pan_int.h @@ -74,7 +74,6 @@ typedef struct { size_t errors{0}; size_t drops{0}; } write, read; - } tPAN_CONN; /* The main PAN control block diff --git a/system/stack/smp/p_256_ecc_pp.h b/system/stack/smp/p_256_ecc_pp.h index 0f3b507a92..c407530d44 100644 --- a/system/stack/smp/p_256_ecc_pp.h +++ b/system/stack/smp/p_256_ecc_pp.h @@ -51,7 +51,6 @@ typedef struct { // base point, a point on E of order r Point G; - } elliptic_curve_t; extern elliptic_curve_t curve; diff --git a/system/stack/smp/smp_main.cc b/system/stack/smp/smp_main.cc index ead1d83028..26635cf4d8 100644 --- a/system/stack/smp/smp_main.cc +++ b/system/stack/smp/smp_main.cc @@ -329,7 +329,8 @@ static const uint8_t smp_all_table[][SMP_SM_NUM_COLS] = { /* AUTH_CMPL */ {SMP_SEND_PAIR_FAIL, SMP_PAIRING_CMPL, SMP_STATE_IDLE}, /* L2C_DISC */ - {SMP_PAIR_TERMINATE, SMP_SM_NO_ACTION, SMP_STATE_IDLE}}; + {SMP_PAIR_TERMINATE, SMP_SM_NO_ACTION, SMP_STATE_IDLE}, +}; static const uint8_t smp_central_idle_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ @@ -342,8 +343,7 @@ static const uint8_t smp_central_idle_table[][SMP_SM_NUM_COLS] = { /* AUTH_CMPL */ {SMP_PAIRING_CMPL, SMP_SM_NO_ACTION, SMP_STATE_IDLE}, /* CR_LOC_SC_OOB_DATA */ - {SMP_CREATE_PRIVATE_KEY, SMP_SM_NO_ACTION, SMP_STATE_CREATE_LOCAL_SEC_CONN_OOB_DATA} - + {SMP_CREATE_PRIVATE_KEY, SMP_SM_NO_ACTION, SMP_STATE_CREATE_LOCAL_SEC_CONN_OOB_DATA}, }; static const uint8_t smp_central_wait_for_app_response_table[][SMP_SM_NUM_COLS] = { @@ -373,7 +373,8 @@ static const uint8_t smp_central_wait_for_app_response_table[][SMP_SM_NUM_COLS] /* KEYPR_NOTIF */ {SMP_SEND_KEYPRESS_NOTIFICATION, SMP_SM_NO_ACTION, SMP_STATE_WAIT_APP_RSP}, /* SC_OOB_DATA */ - {SMP_USE_OOB_PRIVATE_KEY, SMP_SM_NO_ACTION, SMP_STATE_PUBLIC_KEY_EXCH}}; + {SMP_USE_OOB_PRIVATE_KEY, SMP_SM_NO_ACTION, SMP_STATE_PUBLIC_KEY_EXCH}, +}; static const uint8_t smp_central_pair_request_response_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ @@ -386,18 +387,21 @@ static const uint8_t smp_central_pair_request_response_table[][SMP_SM_NUM_COLS] /* KEY_READY */ {SMP_GENERATE_CONFIRM, SMP_SM_NO_ACTION, SMP_STATE_WAIT_CONFIRM} /* PUBL_KEY_EXCH_REQ */, - {SMP_CREATE_PRIVATE_KEY, SMP_SM_NO_ACTION, SMP_STATE_PUBLIC_KEY_EXCH}}; + {SMP_CREATE_PRIVATE_KEY, SMP_SM_NO_ACTION, SMP_STATE_PUBLIC_KEY_EXCH}, +}; static const uint8_t smp_central_wait_for_confirm_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ /* KEY_READY*/ /* CONFIRM ready */ - {SMP_SEND_CONFIRM, SMP_SM_NO_ACTION, SMP_STATE_CONFIRM}}; + {SMP_SEND_CONFIRM, SMP_SM_NO_ACTION, SMP_STATE_CONFIRM}, +}; static const uint8_t smp_central_confirm_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ /* CONFIRM */ - {SMP_PROC_CONFIRM, SMP_SEND_RAND, SMP_STATE_RAND}}; + {SMP_PROC_CONFIRM, SMP_SEND_RAND, SMP_STATE_RAND}, +}; static const uint8_t smp_central_rand_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ @@ -406,7 +410,8 @@ static const uint8_t smp_central_rand_table[][SMP_SM_NUM_COLS] = { /* KEY_READY */ {SMP_PROC_COMPARE, SMP_SM_NO_ACTION, SMP_STATE_RAND}, /* Compare ready */ /* ENC_REQ */ - {SMP_GENERATE_STK, SMP_SM_NO_ACTION, SMP_STATE_ENCRYPTION_PENDING}}; + {SMP_GENERATE_STK, SMP_SM_NO_ACTION, SMP_STATE_ENCRYPTION_PENDING}, +}; static const uint8_t smp_central_public_key_exchange_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ @@ -493,7 +498,8 @@ static const uint8_t smp_central_enc_pending_table[][SMP_SM_NUM_COLS] = { /* ENCRYPTED */ {SMP_CHECK_AUTH_REQ, SMP_SM_NO_ACTION, SMP_STATE_ENCRYPTION_PENDING}, /* BOND_REQ */ - {SMP_KEY_DISTRIBUTE, SMP_SM_NO_ACTION, SMP_STATE_BOND_PENDING}}; + {SMP_KEY_DISTRIBUTE, SMP_SM_NO_ACTION, SMP_STATE_BOND_PENDING}, +}; static const uint8_t smp_central_bond_pending_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ @@ -519,7 +525,8 @@ static const uint8_t smp_central_create_local_sec_conn_oob_data[][SMP_SM_NUM_COL /* LOC_PUBL_KEY_CRTD */ {SMP_SET_LOCAL_OOB_KEYS, SMP_SM_NO_ACTION, SMP_STATE_CREATE_LOCAL_SEC_CONN_OOB_DATA}, /* HAVE_LOC_NONCE */ - {SMP_SET_LOCAL_OOB_RAND_COMMITMENT, SMP_SM_NO_ACTION, SMP_STATE_IDLE}}; + {SMP_SET_LOCAL_OOB_RAND_COMMITMENT, SMP_SM_NO_ACTION, SMP_STATE_IDLE}, +}; /************ SMP Peripheral FSM State/Event Indirection Table **************/ static const uint8_t smp_peripheral_entry_map[][SMP_STATE_MAX] = { @@ -621,7 +628,8 @@ static const uint8_t smp_peripheral_idle_table[][SMP_SM_NUM_COLS] = { /* PAIR_REQ */ {SMP_PROC_PAIR_CMD, SMP_SEND_APP_CBACK, SMP_STATE_WAIT_APP_RSP}, /* CR_LOC_SC_OOB_DATA */ - {SMP_CREATE_PRIVATE_KEY, SMP_SM_NO_ACTION, SMP_STATE_CREATE_LOCAL_SEC_CONN_OOB_DATA}}; + {SMP_CREATE_PRIVATE_KEY, SMP_SM_NO_ACTION, SMP_STATE_CREATE_LOCAL_SEC_CONN_OOB_DATA}, +}; static const uint8_t smp_peripheral_wait_for_app_response_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ @@ -684,7 +692,8 @@ static const uint8_t smp_peripheral_wait_confirm_table[][SMP_SM_NUM_COLS] = { /* CONFIRM */ {SMP_PROC_CONFIRM, SMP_SEND_CONFIRM, SMP_STATE_CONFIRM}, /* KEY_READY*/ - {SMP_PROC_SL_KEY, SMP_SM_NO_ACTION, SMP_STATE_WAIT_CONFIRM}}; + {SMP_PROC_SL_KEY, SMP_SM_NO_ACTION, SMP_STATE_WAIT_CONFIRM}, +}; static const uint8_t smp_peripheral_confirm_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ @@ -693,14 +702,16 @@ static const uint8_t smp_peripheral_confirm_table[][SMP_SM_NUM_COLS] = { /* TK/Confirm ready */ /* KEY_READY*/ - {SMP_PROC_SL_KEY, SMP_SM_NO_ACTION, SMP_STATE_CONFIRM}}; + {SMP_PROC_SL_KEY, SMP_SM_NO_ACTION, SMP_STATE_CONFIRM}, +}; static const uint8_t smp_peripheral_rand_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ /* KEY_READY */ {SMP_PROC_COMPARE, SMP_SM_NO_ACTION, SMP_STATE_RAND}, /* compare match */ /* RAND */ - {SMP_SEND_RAND, SMP_SM_NO_ACTION, SMP_STATE_ENCRYPTION_PENDING}}; + {SMP_SEND_RAND, SMP_SM_NO_ACTION, SMP_STATE_ENCRYPTION_PENDING}, +}; static const uint8_t smp_peripheral_public_key_exch_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ @@ -803,7 +814,8 @@ static const uint8_t smp_peripheral_enc_pending_table[][SMP_SM_NUM_COLS] = { /* ENCRYPTED */ {SMP_CHECK_AUTH_REQ, SMP_SM_NO_ACTION, SMP_STATE_ENCRYPTION_PENDING}, /* BOND_REQ */ - {SMP_KEY_DISTRIBUTE, SMP_SM_NO_ACTION, SMP_STATE_BOND_PENDING}}; + {SMP_KEY_DISTRIBUTE, SMP_SM_NO_ACTION, SMP_STATE_BOND_PENDING}, +}; static const uint8_t smp_peripheral_bond_pending_table[][SMP_SM_NUM_COLS] = { /* Event Action Next State */ @@ -832,7 +844,8 @@ static const uint8_t smp_peripheral_create_local_sec_conn_oob_data[][SMP_SM_NUM_ /* LOC_PUBL_KEY_CRTD */ {SMP_SET_LOCAL_OOB_KEYS, SMP_SM_NO_ACTION, SMP_STATE_CREATE_LOCAL_SEC_CONN_OOB_DATA}, /* HAVE_LOC_NONCE */ - {SMP_SET_LOCAL_OOB_RAND_COMMITMENT, SMP_SM_NO_ACTION, SMP_STATE_IDLE}}; + {SMP_SET_LOCAL_OOB_RAND_COMMITMENT, SMP_SM_NO_ACTION, SMP_STATE_IDLE}, +}; static const tSMP_SM_TBL smp_state_table[][2] = { /* SMP_STATE_IDLE */ diff --git a/system/stack/srvc/srvc_eng_int.h b/system/stack/srvc/srvc_eng_int.h index 6f8dde3d75..ef2c938b32 100644 --- a/system/stack/srvc/srvc_eng_int.h +++ b/system/stack/srvc/srvc_eng_int.h @@ -43,7 +43,6 @@ typedef struct { uint8_t cur_srvc_id; tDIS_VALUE dis_value; - } tSRVC_CLCB; /* service engine control block */ @@ -51,7 +50,6 @@ typedef struct { tSRVC_CLCB clcb[SRVC_MAX_APPS]; /* connection link*/ tGATT_IF gatt_if; bool enabled; - } tSRVC_ENG_CB; /* Global GATT data */ diff --git a/system/test/headless/utils/power_mode_client.h b/system/test/headless/utils/power_mode_client.h index 994aeea21d..1f66c63419 100644 --- a/system/test/headless/utils/power_mode_client.h +++ b/system/test/headless/utils/power_mode_client.h @@ -114,7 +114,6 @@ private: mutable std::mutex mutex; std::unordered_map<RawAddress, std::deque<std::promise<power_mode_callback_t>>> promises_map_; size_t cnt = 0; - } queue_; } // namespace |