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

Commit 3a642ef1 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Move stack/l2cap::text from compilation unit into header am: 17db7f5b 

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

Change-Id: I62e859e7f63a1e7dae963ba97e25bf0c05a53607
parents 7ac40cc6 17db7f5b

system/stack/l2cap/l2c_csm.cc

+0 −23
Original line number Diff line number Diff line
@@ -100,29 +100,6 @@ static void l2c_csm_indicate_connection_open(tL2C_CCB* p_ccb) { 
  }

}



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");

    case CST_ORIG_W4_SEC_COMP: /* Originator waits security clearence */

      return std::string("security pending(orig)");

    case CST_TERM_W4_SEC_COMP: /* Acceptor waits security clearence */

      return std::string("security pending(term)");

    case CST_W4_L2CAP_CONNECT_RSP: /* Waiting for peer connect response */

      return std::string("wait connect response from peer");

    case CST_W4_L2CA_CONNECT_RSP: /* Waiting for upper layer connect rsp */

      return std::string("wait connect response from upper");

    case CST_CONFIG: /* Negotiating configuration */

      return std::string("configuring");

    case CST_OPEN: /* Data transfer state */

      return std::string("open");

    case CST_W4_L2CAP_DISCONNECT_RSP: /* Waiting for peer disconnect rsp */

      return std::string("wait disconnect response from peer");

    case CST_W4_L2CA_DISCONNECT_RSP: /* Waiting for upper layer disc rsp */

      return std::string("wait disconnect response from upper");

  }

}



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

 *

 * Function         l2c_csm_execute

system/stack/l2cap/l2c_int.h

+21 −0
Original line number Diff line number Diff line
@@ -81,6 +81,27 @@ typedef enum { 
  CST_W4_L2CA_DISCONNECT_RSP   /* Waiting for upper layer disc rsp */

} tL2C_CHNL_STATE;



#define CASE_RETURN_TEXT(code) \

  case code:                   \

    return #code



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

  switch (state) {

    CASE_RETURN_TEXT(CST_CLOSED);

    CASE_RETURN_TEXT(CST_ORIG_W4_SEC_COMP);

    CASE_RETURN_TEXT(CST_TERM_W4_SEC_COMP);

    CASE_RETURN_TEXT(CST_W4_L2CAP_CONNECT_RSP);

    CASE_RETURN_TEXT(CST_W4_L2CA_CONNECT_RSP);

    CASE_RETURN_TEXT(CST_CONFIG);

    CASE_RETURN_TEXT(CST_OPEN);

    CASE_RETURN_TEXT(CST_W4_L2CAP_DISCONNECT_RSP);

    CASE_RETURN_TEXT(CST_W4_L2CA_DISCONNECT_RSP);

    default:

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

  }

}

#undef CASE_RETURN_TEXT



/* Define the possible L2CAP link states

*/

typedef enum {