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

Commit ebe0edf8 authored by Chris Manton's avatar Chris Manton
Browse files

Use proper search state bta::tBTA_DM_STATE

Requires moving definition before use

Bug: 188297862
Tag: #refactor
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ic3543d18c73202d5e214cabbc6fbc57048294ef1
parent 54ad5468
Loading
Loading
Loading
Loading
+4 −2
Original line number Original line Diff line number Diff line
@@ -289,8 +289,10 @@ void bta_dm_enable(tBTA_DM_SEC_CBACK* p_sec_cback) {
  btm_local_io_caps = btif_storage_get_local_io_caps();
  btm_local_io_caps = btif_storage_get_local_io_caps();
}
}


void bta_dm_search_set_state(uint8_t state) { bta_dm_search_cb.state = state; }
void bta_dm_search_set_state(tBTA_DM_STATE state) {
uint8_t bta_dm_search_get_state() { return bta_dm_search_cb.state; }
  bta_dm_search_cb.state = state;
}
tBTA_DM_STATE bta_dm_search_get_state() { return bta_dm_search_cb.state; }


/*******************************************************************************
/*******************************************************************************
 *
 *
+24 −24
Original line number Original line Diff line number Diff line
@@ -357,6 +357,27 @@ typedef struct {
  alarm_t* switch_delay_timer;
  alarm_t* switch_delay_timer;
} tBTA_DM_CB;
} tBTA_DM_CB;


/* DM search state */
typedef enum {

  BTA_DM_SEARCH_IDLE,
  BTA_DM_SEARCH_ACTIVE,
  BTA_DM_SEARCH_CANCELLING,
  BTA_DM_DISCOVER_ACTIVE

} tBTA_DM_STATE;

inline std::string bta_dm_state_text(const tBTA_DM_STATE& state) {
  switch (state) {
    CASE_RETURN_TEXT(BTA_DM_SEARCH_IDLE);
    CASE_RETURN_TEXT(BTA_DM_SEARCH_ACTIVE);
    CASE_RETURN_TEXT(BTA_DM_SEARCH_CANCELLING);
    CASE_RETURN_TEXT(BTA_DM_DISCOVER_ACTIVE);
    default:
      return base::StringPrintf("UNKNOWN[%d]", state);
  }
}

/* DM search control block */
/* DM search control block */
typedef struct {
typedef struct {
  tBTA_DM_SEARCH_CBACK* p_search_cback;
  tBTA_DM_SEARCH_CBACK* p_search_cback;
@@ -365,7 +386,7 @@ typedef struct {
  tBTA_SERVICE_MASK services_to_search;
  tBTA_SERVICE_MASK services_to_search;
  tBTA_SERVICE_MASK services_found;
  tBTA_SERVICE_MASK services_found;
  tSDP_DISCOVERY_DB* p_sdp_db;
  tSDP_DISCOVERY_DB* p_sdp_db;
  uint16_t state;
  tBTA_DM_STATE state;
  RawAddress peer_bdaddr;
  RawAddress peer_bdaddr;
  bool name_discover_done;
  bool name_discover_done;
  BD_NAME peer_name;
  BD_NAME peer_name;
@@ -396,27 +417,6 @@ typedef struct {
                                         is primary record */
                                         is primary record */
} tBTA_DM_DI_CB;
} tBTA_DM_DI_CB;


/* DM search state */
typedef enum {

  BTA_DM_SEARCH_IDLE,
  BTA_DM_SEARCH_ACTIVE,
  BTA_DM_SEARCH_CANCELLING,
  BTA_DM_DISCOVER_ACTIVE

} tBTA_DM_STATE;

inline std::string bta_dm_state_text(const tBTA_DM_STATE& state) {
  switch (state) {
    CASE_RETURN_TEXT(BTA_DM_SEARCH_IDLE);
    CASE_RETURN_TEXT(BTA_DM_SEARCH_ACTIVE);
    CASE_RETURN_TEXT(BTA_DM_SEARCH_CANCELLING);
    CASE_RETURN_TEXT(BTA_DM_DISCOVER_ACTIVE);
    default:
      return base::StringPrintf("UNKNOWN[%d]", state);
  }
}

typedef struct {
typedef struct {
  uint16_t page_timeout; /* timeout for page in slots */
  uint16_t page_timeout; /* timeout for page in slots */
  bool avoid_scatter; /* true to avoid scatternet when av is streaming (be the
  bool avoid_scatter; /* true to avoid scatternet when av is streaming (be the
@@ -591,8 +591,8 @@ extern void bta_dm_set_event_filter_inquiry_result_all_devices();


extern void bta_dm_ble_reset_id(void);
extern void bta_dm_ble_reset_id(void);


uint8_t bta_dm_search_get_state();
tBTA_DM_STATE bta_dm_search_get_state();
void bta_dm_search_set_state(uint8_t state);
void bta_dm_search_set_state(tBTA_DM_STATE state);


void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding);
void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding);
void bta_dm_eir_update_cust_uuid(const tBTA_CUSTOM_UUID &curr, bool adding);
void bta_dm_eir_update_cust_uuid(const tBTA_CUSTOM_UUID &curr, bool adding);