diff options
Diffstat (limited to 'btif/include/btif_hh.h')
| -rw-r--r-- | btif/include/btif_hh.h | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/btif/include/btif_hh.h b/btif/include/btif_hh.h index 1d4bc93e2..b71d347c1 100644 --- a/btif/include/btif_hh.h +++ b/btif/include/btif_hh.h @@ -23,7 +23,7 @@ #include <hardware/bt_hh.h> #include <pthread.h> #include <stdint.h> -#include "bta/include/bta_hh_api.h" +#include "bta_hh_api.h" #include "btu.h" #include "osi/include/fixed_queue.h" @@ -46,7 +46,7 @@ * Type definitions and return values ******************************************************************************/ -typedef enum : unsigned { +typedef enum { BTIF_HH_DISABLED = 0, BTIF_HH_ENABLED, BTIF_HH_DISABLING, @@ -56,26 +56,6 @@ typedef enum : unsigned { BTIF_HH_DEV_DISCONNECTED } BTIF_HH_STATUS; -#define CASE_RETURN_TEXT(code) \ - case code: \ - return #code - -inline std::string btif_hh_status_text(const BTIF_HH_STATUS& status) { - switch (status) { - CASE_RETURN_TEXT(BTIF_HH_DISABLED); - CASE_RETURN_TEXT(BTIF_HH_ENABLED); - CASE_RETURN_TEXT(BTIF_HH_DISABLING); - CASE_RETURN_TEXT(BTIF_HH_DEV_UNKNOWN); - CASE_RETURN_TEXT(BTIF_HH_DEV_CONNECTING); - CASE_RETURN_TEXT(BTIF_HH_DEV_CONNECTED); - CASE_RETURN_TEXT(BTIF_HH_DEV_DISCONNECTED); - default: - return std::string("UNKNOWN[%hhu]", status); - } -} -#undef CASE_RETURN_TEXT - -// Shared with uhid polling thread typedef struct { bthh_connection_state_t dev_status; uint8_t dev_handle; @@ -86,7 +66,6 @@ typedef struct { int fd; bool ready_for_data; pthread_t hh_poll_thread_id; - pid_t pid{-1}; uint8_t hh_keep_polling; alarm_t* vup_timer; fixed_queue_t* get_rpt_id_queue; @@ -130,8 +109,6 @@ extern void btif_hh_disconnect(RawAddress* bd_addr); extern void btif_hh_setreport(btif_hh_device_t* p_dev, bthh_report_type_t r_type, uint16_t size, uint8_t* report); -extern void btif_hh_senddata(btif_hh_device_t* p_dev, uint16_t size, - uint8_t* report); extern void btif_hh_getreport(btif_hh_device_t* p_dev, bthh_report_type_t r_type, uint8_t reportId, uint16_t bufferSize); |