Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ddba41d authored by Chris Manton's avatar Chris Manton
Browse files

Canonicalization of tGATT_CBACK gap and gatt 

Towards readable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: I34092cd3c8776d649532a192e90190516d2ae09d
parent e2b2276a

system/bta/gatt/bta_gatts_act.cc

+11 −9
Original line number Diff line number Diff line
@@ -60,15 +60,17 @@ static void bta_gatts_conn_update_cback(tGATT_IF gatt_if, uint16_t conn_id, 
                                        uint16_t interval, uint16_t latency,

                                        uint16_t timeout, tGATT_STATUS status);



static tGATT_CBACK bta_gatts_cback = {bta_gatts_conn_cback,

                                      NULL,

                                      NULL,

                                      NULL,

                                      bta_gatts_send_request_cback,

                                      NULL,

                                      bta_gatts_cong_cback,

                                      bta_gatts_phy_update_cback,

                                      bta_gatts_conn_update_cback};

static tGATT_CBACK bta_gatts_cback = {

    .p_conn_cb = bta_gatts_conn_cback,

    .p_cmpl_cb = nullptr,

    .p_disc_res_cb = nullptr,

    .p_disc_cmpl_cb = nullptr,

    .p_req_cb = bta_gatts_send_request_cback,

    .p_enc_cmpl_cb = nullptr,

    .p_congestion_cb = bta_gatts_cong_cback,

    .p_phy_update_cb = bta_gatts_phy_update_cback,

    .p_conn_update_cb = bta_gatts_conn_update_cback,

};



tGATT_APPL_INFO bta_gatts_nv_cback = {bta_gatts_nv_save_cback,

                                      bta_gatts_nv_srv_chg_cback};

system/stack/gap/gap_ble.cc

+11 −9
Original line number Diff line number Diff line
@@ -59,15 +59,17 @@ void client_connect_cback(tGATT_IF, const RawAddress&, uint16_t, bool, 
void client_cmpl_cback(uint16_t, tGATTC_OPTYPE, tGATT_STATUS,

                       tGATT_CL_COMPLETE*);



tGATT_CBACK gap_cback = {client_connect_cback,

                         client_cmpl_cback,

                         NULL,

                         NULL,

                         server_attr_request_cback,

                         NULL,

                         NULL,

                         NULL,

                         NULL};

tGATT_CBACK gap_cback = {

    .p_conn_cb = client_connect_cback,

    .p_cmpl_cb = client_cmpl_cback,

    .p_disc_res_cb = nullptr,

    .p_disc_cmpl_cb = nullptr,

    .p_req_cb = server_attr_request_cback,

    .p_enc_cmpl_cb = nullptr,

    .p_congestion_cb = nullptr,

    .p_phy_update_cb = nullptr,

    .p_conn_update_cb = nullptr,

};



constexpr int GAP_CHAR_DEV_NAME_SIZE = BD_NAME_LEN;

constexpr int GAP_MAX_CHAR_NUM = 4;