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

Commit 1bf41d3f authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Use stack/l2cap/l2c_csm::channel_state_text() am: 0b9082eb 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1496548

Change-Id: I85894b1d263d5a7358e7ff86d7e051a6a692eb73
parents fb3da08a 0b9082eb

system/stack/l2cap/l2c_csm.cc

+31 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void l2c_csm_indicate_connection_open(tL2C_CCB* p_ccb) { 
  }

}



std::string channel_state_text(const tL2C_CHNL_STATE& state) {

static std::string channel_state_text(const tL2C_CHNL_STATE& state) {

  switch (state) {

    case CST_CLOSED: /* Channel is in closed state */

      return std::string("closed");
@@ -137,7 +137,9 @@ void l2c_csm_execute(tL2C_CCB* p_ccb, uint16_t event, void* p_data) { 
    return;

  }



  LOG_DEBUG("chnl_state=%d, event=%d", p_ccb->chnl_state, event);

  LOG_DEBUG("Entry chnl_state=%s [%d], event=%s [%d]",

            channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

            l2c_csm_get_event_name(event), event);



  switch (p_ccb->chnl_state) {

    case CST_CLOSED:
@@ -357,6 +359,9 @@ static void l2c_csm_closed(tL2C_CCB* p_ccb, uint16_t event, void* p_data) { 
      l2cu_release_ccb(p_ccb);

      break;

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

            channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

            l2c_csm_get_event_name(event), event);

}



/*******************************************************************************
@@ -450,6 +455,9 @@ static void l2c_csm_orig_w4_sec_comp(tL2C_CCB* p_ccb, uint16_t event, 
      l2cu_release_ccb(p_ccb);

      break;

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

            channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

            l2c_csm_get_event_name(event), event);

}



/*******************************************************************************
@@ -577,6 +585,9 @@ static void l2c_csm_term_w4_sec_comp(tL2C_CCB* p_ccb, uint16_t event, 
                               false, &l2c_link_sec_comp, p_ccb);

      break;

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

            channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

            l2c_csm_get_event_name(event), event);

}



/*******************************************************************************
@@ -731,6 +742,9 @@ static void l2c_csm_w4_l2cap_connect_rsp(tL2C_CCB* p_ccb, uint16_t event, 
      }

      break;

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

            channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

            l2c_csm_get_event_name(event), event);

}



/*******************************************************************************
@@ -877,6 +891,9 @@ static void l2c_csm_w4_l2ca_connect_rsp(tL2C_CCB* p_ccb, uint16_t event, 
      l2c_csm_send_config_req(p_ccb);

      break;

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

            channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

            l2c_csm_get_event_name(event), event);

}



/*******************************************************************************
@@ -1145,6 +1162,9 @@ static void l2c_csm_config(tL2C_CCB* p_ccb, uint16_t event, void* p_data) { 
      (*disconnect_ind)(local_cid, false);

      break;

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

            channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

            l2c_csm_get_event_name(event), event);

}



/*******************************************************************************
@@ -1327,6 +1347,9 @@ static void l2c_csm_open(tL2C_CCB* p_ccb, uint16_t event, void* p_data) { 
      }

      break;

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

            channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

            l2c_csm_get_event_name(event), event);

}



/*******************************************************************************
@@ -1365,6 +1388,9 @@ static void l2c_csm_w4_l2cap_disconnect_rsp(tL2C_CCB* p_ccb, uint16_t event, 
      osi_free(p_data);

      break;

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

            channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

            l2c_csm_get_event_name(event), event);

}



/*******************************************************************************
@@ -1415,6 +1441,9 @@ static void l2c_csm_w4_l2ca_disconnect_rsp(tL2C_CCB* p_ccb, uint16_t event, 
      osi_free(p_data);

      break;

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

            channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

            l2c_csm_get_event_name(event), event);

}



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