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

Commit 8f678663 authored by Chris Manton's avatar Chris Manton
Browse files

Use gatt_client_event_text convention for logging 

Bug: 183374320
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ib557fbeaefb4231ef911cbd3aa1f4f5b33000c69
parent f1a150a5

system/bta/include/bta_gatt_api.h

+23 −34
Original line number Diff line number Diff line
@@ -70,44 +70,33 @@ typedef enum : uint8_t { 
  BTA_GATTC_CONN_UPDATE_EVT = 26,   /* Connection parameters update event */

} tBTA_GATTC_EVT;



inline std::string GattClientEventText(tBTA_GATTC_EVT event) {

#define CASE_RETURN_TEXT(code) \

  case code:                   \

    return #code



inline std::string gatt_client_event_text(const tBTA_GATTC_EVT& event) {

  switch (event) {

    case BTA_GATTC_DEREG_EVT:

      return std::string("deregistered");

    case BTA_GATTC_OPEN_EVT:

      return std::string("opened");

    case BTA_GATTC_CLOSE_EVT:

      return std::string("closed");

    case BTA_GATTC_SEARCH_CMPL_EVT:

      return std::string("discovery completed");

    case BTA_GATTC_SEARCH_RES_EVT:

      return std::string("discovery result");

    case BTA_GATTC_SRVC_DISC_DONE_EVT:

      return std::string("discovery done");

    case BTA_GATTC_NOTIF_EVT:

      return std::string("attribute notification");

    case BTA_GATTC_EXEC_EVT:

      return std::string("execute write completed");

    case BTA_GATTC_ACL_EVT:

      return std::string("ACL up event");

    case BTA_GATTC_CANCEL_OPEN_EVT:

      return std::string("cancel open event");

    case BTA_GATTC_SRVC_CHG_EVT:

      return std::string("service changed");

    case BTA_GATTC_ENC_CMPL_CB_EVT:

      return std::string("encryption complete");

    case BTA_GATTC_CFG_MTU_EVT:

      return std::string("configure MTU complete");

    case BTA_GATTC_CONGEST_EVT:

      return std::string("congestion");

    case BTA_GATTC_PHY_UPDATE_EVT:

      return std::string("PHY change");

    case BTA_GATTC_CONN_UPDATE_EVT:

      return std::string("connection parameters update");

    CASE_RETURN_TEXT(BTA_GATTC_DEREG_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_OPEN_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_CLOSE_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_SEARCH_CMPL_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_SEARCH_RES_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_SRVC_DISC_DONE_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_NOTIF_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_EXEC_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_ACL_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_CANCEL_OPEN_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_SRVC_CHG_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_ENC_CMPL_CB_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_CFG_MTU_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_CONGEST_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_PHY_UPDATE_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_CONN_UPDATE_EVT);

    default:

      return std::string("unknown");

      return std::string("UNKNOWN[%hhu]", event);

  }

}

#undef CASE_RETURN_TEXT



typedef struct {

  uint16_t unit;  /* as UUIUD defined by SIG */

system/btif/src/btif_gatt_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void btif_gattc_upstreams_evt(uint16_t event, char* p_param) { 


static void bta_gattc_cback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) {

  LOG_DEBUG(" gatt client callback event:%s [%d]",

            GattClientEventText(event).c_str(), event);

            gatt_client_event_text(event).c_str(), event);

  bt_status_t status =

      btif_transfer_context(btif_gattc_upstreams_evt, (uint16_t)event,

                            (char*)p_data, sizeof(tBTA_GATTC), NULL);