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

Commit 49df7db5 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Enum-ify stack::gatt_status_text am: 764474fb am: d471b49c am: 24011246... 

Enum-ify stack::gatt_status_text am: 764474fb am: d471b49c am: 24011246 am: 260592f2 am: df388e94

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2484907



Change-Id: Icaf00b1191fc45ce4996d86ae486b19340052dcc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 229a3845 df388e94

system/stack/include/gatt_api.h

+58 −0
Original line number Diff line number Diff line
@@ -87,6 +87,64 @@ typedef enum GattStatus : uint8_t { 
  GATT_OUT_OF_RANGE = 0xFF,

} tGATT_STATUS;



#ifndef CASE_RETURN_TEXT

#define CASE_RETURN_TEXT(code) \

  case code:                   \

    return #code

#endif



inline std::string gatt_status_text(const tGATT_STATUS& status) {

  switch (status) {

    CASE_RETURN_TEXT(GATT_SUCCESS);  // Also GATT_ENCRYPED_MITM

    CASE_RETURN_TEXT(GATT_INVALID_HANDLE);

    CASE_RETURN_TEXT(GATT_READ_NOT_PERMIT);

    CASE_RETURN_TEXT(GATT_WRITE_NOT_PERMIT);

    CASE_RETURN_TEXT(GATT_INVALID_PDU);

    CASE_RETURN_TEXT(GATT_INSUF_AUTHENTICATION);

    CASE_RETURN_TEXT(GATT_REQ_NOT_SUPPORTED);

    CASE_RETURN_TEXT(GATT_INVALID_OFFSET);

    CASE_RETURN_TEXT(GATT_INSUF_AUTHORIZATION);

    CASE_RETURN_TEXT(GATT_PREPARE_Q_FULL);

    CASE_RETURN_TEXT(GATT_NOT_FOUND);

    CASE_RETURN_TEXT(GATT_NOT_LONG);

    CASE_RETURN_TEXT(GATT_INSUF_KEY_SIZE);

    CASE_RETURN_TEXT(GATT_INVALID_ATTR_LEN);

    CASE_RETURN_TEXT(GATT_ERR_UNLIKELY);

    CASE_RETURN_TEXT(GATT_INSUF_ENCRYPTION);

    CASE_RETURN_TEXT(GATT_UNSUPPORT_GRP_TYPE);

    CASE_RETURN_TEXT(GATT_INSUF_RESOURCE);

    CASE_RETURN_TEXT(GATT_DATABASE_OUT_OF_SYNC);

    CASE_RETURN_TEXT(GATT_VALUE_NOT_ALLOWED);

    CASE_RETURN_TEXT(GATT_ILLEGAL_PARAMETER);

    CASE_RETURN_TEXT(GATT_TOO_SHORT);

    CASE_RETURN_TEXT(GATT_NO_RESOURCES);

    CASE_RETURN_TEXT(GATT_INTERNAL_ERROR);

    CASE_RETURN_TEXT(GATT_WRONG_STATE);

    CASE_RETURN_TEXT(GATT_DB_FULL);

    CASE_RETURN_TEXT(GATT_BUSY);

    CASE_RETURN_TEXT(GATT_ERROR);

    CASE_RETURN_TEXT(GATT_CMD_STARTED);

    CASE_RETURN_TEXT(GATT_PENDING);

    CASE_RETURN_TEXT(GATT_AUTH_FAIL);

    CASE_RETURN_TEXT(GATT_MORE);

    CASE_RETURN_TEXT(GATT_INVALID_CFG);

    CASE_RETURN_TEXT(GATT_SERVICE_STARTED);

    CASE_RETURN_TEXT(GATT_ENCRYPED_NO_MITM);

    CASE_RETURN_TEXT(GATT_NOT_ENCRYPTED);

    CASE_RETURN_TEXT(GATT_CONGESTED);

    CASE_RETURN_TEXT(GATT_DUP_REG);

    CASE_RETURN_TEXT(GATT_ALREADY_OPEN);

    CASE_RETURN_TEXT(GATT_CANCEL);

    CASE_RETURN_TEXT(GATT_CCC_CFG_ERR);

    CASE_RETURN_TEXT(GATT_PRC_IN_PROGRESS);

    CASE_RETURN_TEXT(GATT_OUT_OF_RANGE);

    default:

      return base::StringPrintf("UNKNOWN[%hhu]", status);

  }

}



#undef CASE_RETURN_TEXT



typedef enum : uint8_t {

  GATT_RSP_ERROR = 0x01,

  GATT_REQ_MTU = 0x02,

system/stack/test/gatt/stack_gatt_test.cc

+55 −0
Original line number Diff line number Diff line
@@ -136,3 +136,58 @@ TEST_F(StackGattTest, GATT_Register_Deregister) { 


  gatt_free();

}



TEST_F(StackGattTest, gatt_status_text) {

  std::vector<std::pair<tGATT_STATUS, std::string>> statuses = {

      std::make_pair(GATT_SUCCESS, "GATT_SUCCESS"),  // Also GATT_ENCRYPED_MITM

      std::make_pair(GATT_INVALID_HANDLE, "GATT_INVALID_HANDLE"),

      std::make_pair(GATT_READ_NOT_PERMIT, "GATT_READ_NOT_PERMIT"),

      std::make_pair(GATT_WRITE_NOT_PERMIT, "GATT_WRITE_NOT_PERMIT"),

      std::make_pair(GATT_INVALID_PDU, "GATT_INVALID_PDU"),

      std::make_pair(GATT_INSUF_AUTHENTICATION, "GATT_INSUF_AUTHENTICATION"),

      std::make_pair(GATT_REQ_NOT_SUPPORTED, "GATT_REQ_NOT_SUPPORTED"),

      std::make_pair(GATT_INVALID_OFFSET, "GATT_INVALID_OFFSET"),

      std::make_pair(GATT_INSUF_AUTHORIZATION, "GATT_INSUF_AUTHORIZATION"),

      std::make_pair(GATT_PREPARE_Q_FULL, "GATT_PREPARE_Q_FULL"),

      std::make_pair(GATT_NOT_FOUND, "GATT_NOT_FOUND"),

      std::make_pair(GATT_NOT_LONG, "GATT_NOT_LONG"),

      std::make_pair(GATT_INSUF_KEY_SIZE, "GATT_INSUF_KEY_SIZE"),

      std::make_pair(GATT_INVALID_ATTR_LEN, "GATT_INVALID_ATTR_LEN"),

      std::make_pair(GATT_ERR_UNLIKELY, "GATT_ERR_UNLIKELY"),

      std::make_pair(GATT_INSUF_ENCRYPTION, "GATT_INSUF_ENCRYPTION"),

      std::make_pair(GATT_UNSUPPORT_GRP_TYPE, "GATT_UNSUPPORT_GRP_TYPE"),

      std::make_pair(GATT_INSUF_RESOURCE, "GATT_INSUF_RESOURCE"),

      std::make_pair(GATT_DATABASE_OUT_OF_SYNC, "GATT_DATABASE_OUT_OF_SYNC"),

      std::make_pair(GATT_VALUE_NOT_ALLOWED, "GATT_VALUE_NOT_ALLOWED"),

      std::make_pair(GATT_ILLEGAL_PARAMETER, "GATT_ILLEGAL_PARAMETER"),

      std::make_pair(GATT_TOO_SHORT, "GATT_TOO_SHORT"),

      std::make_pair(GATT_NO_RESOURCES, "GATT_NO_RESOURCES"),

      std::make_pair(GATT_INTERNAL_ERROR, "GATT_INTERNAL_ERROR"),

      std::make_pair(GATT_WRONG_STATE, "GATT_WRONG_STATE"),

      std::make_pair(GATT_DB_FULL, "GATT_DB_FULL"),

      std::make_pair(GATT_BUSY, "GATT_BUSY"),

      std::make_pair(GATT_ERROR, "GATT_ERROR"),

      std::make_pair(GATT_CMD_STARTED, "GATT_CMD_STARTED"),

      std::make_pair(GATT_PENDING, "GATT_PENDING"),

      std::make_pair(GATT_AUTH_FAIL, "GATT_AUTH_FAIL"),

      std::make_pair(GATT_MORE, "GATT_MORE"),

      std::make_pair(GATT_INVALID_CFG, "GATT_INVALID_CFG"),

      std::make_pair(GATT_SERVICE_STARTED, "GATT_SERVICE_STARTED"),

      std::make_pair(GATT_ENCRYPED_NO_MITM, "GATT_ENCRYPED_NO_MITM"),

      std::make_pair(GATT_NOT_ENCRYPTED, "GATT_NOT_ENCRYPTED"),

      std::make_pair(GATT_CONGESTED, "GATT_CONGESTED"),

      std::make_pair(GATT_DUP_REG, "GATT_DUP_REG"),

      std::make_pair(GATT_ALREADY_OPEN, "GATT_ALREADY_OPEN"),

      std::make_pair(GATT_CANCEL, "GATT_CANCEL"),

      std::make_pair(GATT_CCC_CFG_ERR, "GATT_CCC_CFG_ERR"),

      std::make_pair(GATT_PRC_IN_PROGRESS, "GATT_PRC_IN_PROGRESS"),

      std::make_pair(GATT_OUT_OF_RANGE, "GATT_OUT_OF_RANGE"),

  };

  for (const auto& status : statuses) {

    ASSERT_STREQ(status.second.c_str(), gatt_status_text(status.first).c_str());

  }

  // Typical max value is already classified so use arbitrary unused one.

  auto unknown = base::StringPrintf("UNKNOWN[%hhu]", 0xfc);

  ASSERT_STREQ(unknown.c_str(),

               gatt_status_text(static_cast<tGATT_STATUS>(0xfc)).c_str());

}