diff options
| author | Chris Manton <cmanton@google.com> | 2021-04-29 13:43:55 -0700 |
|---|---|---|
| committer | Chris Manton <cmanton@google.com> | 2021-05-03 18:15:58 -0700 |
| commit | 61bcb3af180cfcc2f34949456621bb963f01a551 (patch) | |
| tree | 997b3eaf15bd09a57a2008e18bf157b324ffea03 /include | |
| parent | 78e895ba4ddb5c89338e8c003013e84baaa288f5 (diff) | |
| download | bt-61bcb3af180cfcc2f34949456621bb963f01a551.tar.gz | |
Add include/hardware::bthh_connection_state_text
Bug: 163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: If8acc10eec65cb507ff292c81017e89cd6ccfb82
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware/bt_hh.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/include/hardware/bt_hh.h b/include/hardware/bt_hh.h index 6226a53e0..06272d2c9 100644 --- a/include/hardware/bt_hh.h +++ b/include/hardware/bt_hh.h @@ -18,6 +18,7 @@ #define ANDROID_INCLUDE_BT_HH_H #include <stdint.h> +#include <string> __BEGIN_DECLS @@ -26,39 +27,31 @@ __BEGIN_DECLS /* HH connection states */ typedef enum { BTHH_CONN_STATE_CONNECTED = 0, - BTHH_CONN_STATE_CONNECTING, - BTHH_CONN_STATE_DISCONNECTED, - BTHH_CONN_STATE_DISCONNECTING, - BTHH_CONN_STATE_FAILED_MOUSE_FROM_HOST, - BTHH_CONN_STATE_FAILED_KBD_FROM_HOST, - BTHH_CONN_STATE_FAILED_TOO_MANY_DEVICES, - BTHH_CONN_STATE_FAILED_NO_BTHID_DRIVER, - BTHH_CONN_STATE_FAILED_GENERIC, - BTHH_CONN_STATE_UNKNOWN + BTHH_CONN_STATE_CONNECTING = 1, + BTHH_CONN_STATE_DISCONNECTED = 2, + BTHH_CONN_STATE_DISCONNECTING = 3, + BTHH_CONN_STATE_UNKNOWN = 0xff, } bthh_connection_state_t; +__END_DECLS #define CASE_RETURN_TEXT(code) \ case code: \ return #code -static inline std::string bthh_connection_state_text( +inline std::string bthh_connection_state_text( const bthh_connection_state_t& state) { switch (state) { CASE_RETURN_TEXT(BTHH_CONN_STATE_CONNECTED); CASE_RETURN_TEXT(BTHH_CONN_STATE_CONNECTING); CASE_RETURN_TEXT(BTHH_CONN_STATE_DISCONNECTED); CASE_RETURN_TEXT(BTHH_CONN_STATE_DISCONNECTING); - CASE_RETURN_TEXT(BTHH_CONN_STATE_FAILED_MOUSE_FROM_HOST); - CASE_RETURN_TEXT(BTHH_CONN_STATE_FAILED_KBD_FROM_HOST); - CASE_RETURN_TEXT(BTHH_CONN_STATE_FAILED_TOO_MANY_DEVICES); - CASE_RETURN_TEXT(BTHH_CONN_STATE_FAILED_NO_BTHID_DRIVER); - CASE_RETURN_TEXT(BTHH_CONN_STATE_FAILED_GENERIC); CASE_RETURN_TEXT(BTHH_CONN_STATE_UNKNOWN); default: return std::string("UNKNOWN[%u]", state); } } #undef CASE_RETURN_TEXT +__BEGIN_DECLS typedef enum { BTHH_OK = 0, |