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

Commit dd2b0143 authored by Myles Watson's avatar Myles Watson
Browse files

Move Init and Free to btm_inq.cc 

Bug: 322230000
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: Ibfa735b48aa4b3c368324e48d4f22e838fc5e1c8
parent 5c4b212d

system/stack/btm/btm_inq.cc

+31 −0
Original line number Diff line number Diff line
@@ -2421,6 +2421,37 @@ static void on_incoming_hci_event(bluetooth::hci::EventView event) { 
  }

}



void tBTM_INQUIRY_VAR_ST::Init() {

  alarm_free(classic_inquiry_timer);



  classic_inquiry_timer = alarm_new("btm_inq.classic_inquiry_timer");



  discoverable_mode = BTM_NON_DISCOVERABLE;

  connectable_mode = BTM_NON_CONNECTABLE;



  page_scan_window = HCI_DEF_PAGESCAN_WINDOW;

  page_scan_period = HCI_DEF_PAGESCAN_INTERVAL;

  inq_scan_window = HCI_DEF_INQUIRYSCAN_WINDOW;

  inq_scan_period = HCI_DEF_INQUIRYSCAN_INTERVAL;

  inq_scan_type = BTM_SCAN_TYPE_STANDARD;

  page_scan_type = HCI_DEF_SCAN_TYPE;



  p_inq_cmpl_cb = nullptr;

  p_inq_results_cb = nullptr;



  inq_counter = 0;

  inqparms = {};

  inq_cmpl_info = {};



  per_min_delay = 0;

  per_max_delay = 0;

  state = BTM_INQ_INACTIVE_STATE;

  inq_active = 0;

  registered_for_hci_events = false;

}



void tBTM_INQUIRY_VAR_ST::Free() { alarm_free(classic_inquiry_timer); }



namespace bluetooth {

namespace legacy {

namespace testing {

system/stack/btm/neighbor_inquiry.h

+2 −29
Original line number Diff line number Diff line
@@ -228,35 +228,8 @@ struct tBTM_INQUIRY_VAR_ST { 


  bool registered_for_hci_events;



  void Init() {

    alarm_free(classic_inquiry_timer);



    classic_inquiry_timer = alarm_new("btm_inq.classic_inquiry_timer");



    discoverable_mode = BTM_NON_DISCOVERABLE;

    connectable_mode = BTM_NON_CONNECTABLE;



    page_scan_window = HCI_DEF_PAGESCAN_WINDOW;

    page_scan_period = HCI_DEF_PAGESCAN_INTERVAL;

    inq_scan_window = HCI_DEF_INQUIRYSCAN_WINDOW;

    inq_scan_period = HCI_DEF_INQUIRYSCAN_INTERVAL;

    inq_scan_type = BTM_SCAN_TYPE_STANDARD;

    page_scan_type = HCI_DEF_SCAN_TYPE;



    p_inq_cmpl_cb = nullptr;

    p_inq_results_cb = nullptr;



    inq_counter = 0;

    inqparms = {};

    inq_cmpl_info = {};



    per_min_delay = 0;

    per_max_delay = 0;

    state = BTM_INQ_INACTIVE_STATE;

    inq_active = 0;

    registered_for_hci_events = false;

  }

  void Free() { alarm_free(classic_inquiry_timer); }

  void Init();

  void Free();

};



bool btm_inq_find_bdaddr(const RawAddress& p_bda);