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

Commit fdf37e6e authored by Henri Chataing's avatar Henri Chataing
Browse files

system/bta/sys: Migrate to libbluetooth_log 

Test: m com.android.btservices
Bug: 305066880
Flag: EXEMPT, mechanical refactor
Change-Id: I99b0dc1dedf9e0f42bbaa7c4b44543ed72be1b3d
parent 485a950a

system/bta/sys/bta_sys_conn.cc

+8 −5
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
 *

 ******************************************************************************/



#include <bluetooth/log.h>



#include <cstdint>



#include "bta/sys/bta_sys.h"
@@ -34,6 +36,7 @@ 
#include "types/hci_role.h"

#include "types/raw_address.h"



using namespace bluetooth;

/*******************************************************************************

 *

 * Function         bta_sys_rm_register
@@ -87,9 +90,9 @@ void bta_sys_ssr_cfg_register(tBTA_SYS_SSR_CFG_CBACK* p_cback) { 
 ******************************************************************************/

void bta_sys_notify_role_chg(const RawAddress& peer_addr, tHCI_ROLE new_role,

                             tHCI_STATUS hci_status) {

  LOG_DEBUG("Role changed peer:%s new_role:%s hci_status:%s",

            ADDRESS_TO_LOGGABLE_CSTR(peer_addr), RoleText(new_role).c_str(),

            hci_error_code_text(hci_status).c_str());

  log::debug("Role changed peer:{} new_role:{} hci_status:{}",

             ADDRESS_TO_LOGGABLE_CSTR(peer_addr), RoleText(new_role),

             hci_error_code_text(hci_status));

  if (bta_sys_cb.p_role_cb) {

    bta_sys_cb.p_role_cb(BTA_SYS_ROLE_CHANGE, new_role, hci_status, peer_addr);

  }
@@ -432,14 +435,14 @@ void bta_sys_busy(tBTA_SYS_ID id, uint8_t app_id, const RawAddress& peer_addr) { 
 ******************************************************************************/

void bta_sys_eir_register(tBTA_SYS_EIR_CBACK* p_cback) {

  if (bta_sys_cb.eir_cb != nullptr) {

    LOG_WARN("Already registered extended inquiry result callback");

    log::warn("Already registered extended inquiry result callback");

  }

  bta_sys_cb.eir_cb = p_cback;

}



void bta_sys_eir_unregister() {

  if (bta_sys_cb.eir_cb == nullptr) {

    LOG_WARN("Already unregistered extended inquiry result callback");

    log::warn("Already unregistered extended inquiry result callback");

  }

  bta_sys_cb.eir_cb = nullptr;

}

system/bta/sys/bta_sys_main.cc

+8 −5
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <base/functional/bind.h>

#include <base/logging.h>

#include <bluetooth/log.h>



#include <cstring>
@@ -39,6 +40,8 @@ 
#include "stack/include/bt_hdr.h"

#include "stack/include/main_thread.h"



using namespace bluetooth;



/* system manager control block definition */

tBTA_SYS_CB bta_sys_cb;
@@ -69,7 +72,7 @@ void bta_sys_init(void) { 
static void bta_sys_event(BT_HDR_RIGID* p_msg) {

  bool freebuf = true;



  LOG_VERBOSE("%s: Event 0x%x", __func__, p_msg->event);

  log::verbose("Event 0x{:x}", p_msg->event);



  /* get subsystem id from event */

  uint8_t id = (uint8_t)(p_msg->event >> 8);
@@ -78,8 +81,8 @@ static void bta_sys_event(BT_HDR_RIGID* p_msg) { 
  if ((id < BTA_ID_MAX) && (bta_sys_cb.reg[id] != NULL)) {

    freebuf = (*bta_sys_cb.reg[id]->evt_hdlr)(p_msg);

  } else {

    LOG_INFO("Ignoring receipt of unregistered event id:%s[%hhu]",

             BtaIdSysText(static_cast<tBTA_SYS_ID>(id)).c_str(), id);

    log::info("Ignoring receipt of unregistered event id:{}[{}]",

              BtaIdSysText(static_cast<tBTA_SYS_ID>(id)), id);

  }



  if (freebuf) {
@@ -149,7 +152,7 @@ void bta_sys_sendmsg(void* p_msg) { 
          FROM_HERE,

          base::BindOnce(&bta_sys_event, static_cast<BT_HDR_RIGID*>(p_msg))) !=

      BT_STATUS_SUCCESS) {

    LOG(ERROR) << __func__ << ": do_in_main_thread failed";

    log::error("do_in_main_thread failed");

  }

}
@@ -158,7 +161,7 @@ void bta_sys_sendmsg_delayed(void* p_msg, std::chrono::microseconds delay) { 
          FROM_HERE,

          base::Bind(&bta_sys_event, static_cast<BT_HDR_RIGID*>(p_msg)),

          delay) != BT_STATUS_SUCCESS) {

    LOG(ERROR) << __func__ << ": do_in_main_thread_delayed failed";

    log::error("do_in_main_thread_delayed failed");

  }

}