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

Commit 26f3c1d2 authored by Pomai Ahlo's avatar Pomai Ahlo
Browse files

port_api: Remove function names from logs 

The log will already have the function name, this removes the redundant
function names

Bug: 345006660
Test: m com.android.btservices
Flag: EXEMPT Logging change
Change-Id: Ia7f6773162c590b53bb3967fdf62cc63dce0b191
parent 5701b75f

system/stack/rfcomm/port_api.cc

+20 −21
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ int RFCOMM_RemoveServer(uint16_t handle) { 
}



int PORT_SetEventMaskAndCallback(uint16_t handle, uint32_t mask, tPORT_CALLBACK* p_port_cb) {

  log::verbose("PORT_SetEventMask() handle:{} mask:0x{:x}", handle, mask);

  log::verbose("handle:{} mask:0x{:x}", handle, mask);

  tPORT* p_port = get_port_from_handle(handle);

  if (p_port == nullptr) {

    log::error("Unable to get RFCOMM port control block bad handle:{}", handle);
@@ -410,7 +410,7 @@ int PORT_ClearKeepHandleFlag(uint16_t handle) { 
 *

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

int PORT_SetDataCOCallback(uint16_t handle, tPORT_DATA_CO_CALLBACK* p_port_cb) {

  log::verbose("PORT_SetDataCOCallback() handle:{} cb 0x{}", handle, fmt::ptr(p_port_cb));

  log::verbose("handle:{} cb 0x{}", handle, fmt::ptr(p_port_cb));



  tPORT* p_port = get_port_from_handle(handle);

  if (p_port == nullptr) {
@@ -575,7 +575,7 @@ bool PORT_IsCollisionDetected(RawAddress bd_addr) { 
int PORT_SetSettings(uint16_t handle, PortSettings* p_settings) {

  uint8_t baud_rate;



  log::verbose("PORT_SetSettings() handle:{}", handle);

  log::verbose("handle:{}", handle);

  tPORT* p_port = get_port_from_handle(handle);

  if (p_port == nullptr) {

    log::error("Unable to get RFCOMM port control block bad handle:{}", handle);
@@ -590,7 +590,7 @@ int PORT_SetSettings(uint16_t handle, PortSettings* p_settings) { 
    return PORT_LINE_ERR;

  }



  log::verbose("PORT_SetSettings() handle:{} FC_TYPE:0x{:x}", handle, p_settings->fc_type);

  log::verbose("handle:{} FC_TYPE:0x{:x}", handle, p_settings->fc_type);



  baud_rate = p_port->user_port_settings.baud_rate;

  p_port->user_port_settings = *p_settings;
@@ -615,7 +615,7 @@ int PORT_SetSettings(uint16_t handle, PortSettings* p_settings) { 
 *

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

int PORT_GetSettings(uint16_t handle, PortSettings* p_settings) {

  log::verbose("PORT_GetSettings() handle:{}", handle);

  log::verbose("handle:{}", handle);



  tPORT* p_port = get_port_from_handle(handle);

  if (p_port == nullptr) {
@@ -653,7 +653,7 @@ int PORT_FlowControl_MaxCredit(uint16_t handle, bool enable) { 
  bool old_fc;

  uint32_t events;



  log::verbose("PORT_FlowControl() handle:{} enable: {}", handle, enable);

  log::verbose("handle:{} enable: {}", handle, enable);



  tPORT* p_port = get_port_from_handle(handle);

  if (p_port == nullptr) {
@@ -720,7 +720,7 @@ int PORT_ReadData(uint16_t handle, char* p_data, uint16_t max_len, uint16_t* p_l 
  BT_HDR* p_buf;

  uint16_t count;



  log::verbose("PORT_ReadData() handle:{} max_len:{}", handle, max_len);

  log::verbose("handle:{} max_len:{}", handle, max_len);



  /* Initialize this in case of an error */

  *p_len = 0;
@@ -793,10 +793,9 @@ int PORT_ReadData(uint16_t handle, char* p_data, uint16_t max_len, uint16_t* p_l 
  }



  if (*p_len == 1) {

    log::verbose("PORT_ReadData queue:{} returned:{} {:x}", p_port->rx.queue_size, *p_len,

                 p_data[0]);

    log::verbose("queue:{} returned:{} {:x}", p_port->rx.queue_size, *p_len, p_data[0]);

  } else {

    log::verbose("PORT_ReadData queue:{} returned:{}", p_port->rx.queue_size, *p_len);

    log::verbose("queue:{} returned:{}", p_port->rx.queue_size, *p_len);

  }



  /* If rfcomm suspended traffic from the peer based on the rx_queue_size */
@@ -834,7 +833,7 @@ static int port_write(tPORT* p_port, BT_HDR* p_buf) { 
       (PORT_CTRL_REQ_SENT | PORT_CTRL_IND_RECEIVED))) {

    if ((p_port->tx.queue_size > PORT_TX_CRITICAL_WM) ||

        (fixed_queue_length(p_port->tx.queue) > PORT_TX_BUF_CRITICAL_WM)) {

      log::warn("PORT_Write: Queue size: {}", p_port->tx.queue_size);

      log::warn("Queue size: {}", p_port->tx.queue_size);



      osi_free(p_buf);
@@ -846,7 +845,7 @@ static int port_write(tPORT* p_port, BT_HDR* p_buf) { 
    }



    log::verbose(

            "PORT_Write : Data is enqueued. flow disabled {} peer_ready {} state {} ctrl_state "

            "Data is enqueued. flow disabled {} peer_ready {} state {} ctrl_state "

            "{:x}",

            p_port->tx.peer_fc, p_port->rfc.p_mcb && p_port->rfc.p_mcb->peer_ready,

            p_port->rfc.state, p_port->port_ctrl);
@@ -856,7 +855,7 @@ static int port_write(tPORT* p_port, BT_HDR* p_buf) { 


    return PORT_CMD_PENDING;

  } else {

    log::verbose("PORT_Write : Data is being sent");

    log::verbose("Data is being sent");



    RFCOMM_DataReq(p_port->rfc.p_mcb, p_port->dlci, p_buf);

    return PORT_SUCCESS;
@@ -881,7 +880,7 @@ int PORT_WriteDataCO(uint16_t handle, int* p_len) { 
  int rc = 0;

  uint16_t length;



  log::verbose("PORT_WriteDataCO() handle:{}", handle);

  log::verbose("handle:{}", handle);

  *p_len = 0;



  tPORT* p_port = get_port_from_handle(handle);
@@ -891,12 +890,12 @@ int PORT_WriteDataCO(uint16_t handle, int* p_len) { 
  }



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    log::warn("PORT_WriteDataByFd() no port state:{}", p_port->state);

    log::warn("no port state:{}", p_port->state);

    return PORT_NOT_OPENED;

  }



  if (!p_port->peer_mtu) {

    log::error("PORT_WriteDataByFd() peer_mtu:{}", p_port->peer_mtu);

    log::error("peer_mtu:{}", p_port->peer_mtu);

    return PORT_UNKNOWN_ERROR;

  }

  int available = 0;
@@ -983,7 +982,7 @@ int PORT_WriteDataCO(uint16_t handle, int* p_len) { 
      return PORT_UNKNOWN_ERROR;

    }



    log::verbose("PORT_WriteData {} bytes", length);

    log::verbose("{} bytes", length);



    rc = port_write(p_port, p_buf);
@@ -1035,7 +1034,7 @@ int PORT_WriteData(uint16_t handle, const char* p_data, uint16_t max_len, uint16 
  int rc = 0;

  uint16_t length;



  log::verbose("PORT_WriteData() max_len:{}", max_len);

  log::verbose("max_len:{}", max_len);



  *p_len = 0;
@@ -1046,7 +1045,7 @@ int PORT_WriteData(uint16_t handle, const char* p_data, uint16_t max_len, uint16 
  }



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    log::warn("PORT_WriteData() no port state:{}", p_port->state);

    log::warn("no port state:{}", p_port->state);

    return PORT_NOT_OPENED;

  }
@@ -1055,7 +1054,7 @@ int PORT_WriteData(uint16_t handle, const char* p_data, uint16_t max_len, uint16 
  }



  if (!max_len || !p_port->peer_mtu) {

    log::error("PORT_WriteData() peer_mtu:{}", p_port->peer_mtu);

    log::error("peer_mtu:{}", p_port->peer_mtu);

    return PORT_UNKNOWN_ERROR;

  }
@@ -1107,7 +1106,7 @@ int PORT_WriteData(uint16_t handle, const char* p_data, uint16_t max_len, uint16 


    memcpy((uint8_t*)(p_buf + 1) + p_buf->offset, p_data, length);



    log::verbose("PORT_WriteData {} bytes", length);

    log::verbose("{} bytes", length);



    rc = port_write(p_port, p_buf);