diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-25 17:40:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-25 17:40:42 +0000 |
| commit | 64d8291e94e358b6450385cd3959c5e8da8b6b0f (patch) | |
| tree | cdf191ea91d002ae529cf4d7737efe5750153774 /system/stack/rfcomm/rfc_int.h | |
| parent | d8dc6ae8dca7b012c81f393d9728115281b6d412 (diff) | |
| parent | e5e4615ec163f7f481cfeeffb1318516ee3b19b4 (diff) | |
Merge "legacy: Conform rfcomm_mx_state_text to CASE convention" am: 6d7c30d677 am: 97d136ac63 am: e5e4615ec1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2040953
Change-Id: I9ae74b66c2c0162feba93f787e3e8248beceea95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'system/stack/rfcomm/rfc_int.h')
| -rw-r--r-- | system/stack/rfcomm/rfc_int.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/system/stack/rfcomm/rfc_int.h b/system/stack/rfcomm/rfc_int.h index 9b9c96b5a8..1cec364553 100644 --- a/system/stack/rfcomm/rfc_int.h +++ b/system/stack/rfcomm/rfc_int.h @@ -159,27 +159,26 @@ typedef enum : uint16_t { RFC_MX_STATE_DISC_WAIT_UA = 6, } tRFC_MX_STATE; -inline std::string rfcomm_mx_state_text(tRFC_MX_STATE state) { +#define CASE_RETURN_TEXT(code) \ + case code: \ + return #code + +inline std::string rfcomm_mx_state_text(const tRFC_MX_STATE& state) { switch (state) { - case RFC_MX_STATE_IDLE: - return std::string("idle"); - case RFC_MX_STATE_WAIT_CONN_CNF: - return std::string("wait_config"); - case RFC_MX_STATE_CONFIGURE: - return std::string("configure"); - case RFC_MX_STATE_SABME_WAIT_UA: - return std::string("sabme_wait_ua"); - case RFC_MX_STATE_WAIT_SABME: - return std::string("wait_sabme"); - case RFC_MX_STATE_CONNECTED: - return std::string("connected"); - case RFC_MX_STATE_DISC_WAIT_UA: - return std::string("disconnect_wait_ua"); + CASE_RETURN_TEXT(RFC_MX_STATE_IDLE); + CASE_RETURN_TEXT(RFC_MX_STATE_WAIT_CONN_CNF); + CASE_RETURN_TEXT(RFC_MX_STATE_CONFIGURE); + CASE_RETURN_TEXT(RFC_MX_STATE_SABME_WAIT_UA); + CASE_RETURN_TEXT(RFC_MX_STATE_WAIT_SABME); + CASE_RETURN_TEXT(RFC_MX_STATE_CONNECTED); + CASE_RETURN_TEXT(RFC_MX_STATE_DISC_WAIT_UA); default: - return std::string("UNKNOWN"); + return std::string("UNKNOWN[") + std::to_string(state) + std::string("]"); } } +#undef CASE_RETURN_TEXT + /* * Define port states */ |