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

Commit 68c209a1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I9e63ed56,I0d17df01,Ibd2d626d 

* changes:
  legacy: Remove all of controller_get_test_interface
  legacy: Remove all of hci_layer_get_test_interface
  Remove cpp is_gd_hci_enabled because It Is Known
parents 622c78dd 2670e6a5

system/device/include/controller.h

+0 −5
Original line number Diff line number Diff line
@@ -121,8 +121,3 @@ typedef struct controller_t { 
} controller_t;



const controller_t* controller_get_interface();
 


const controller_t* controller_get_test_interface(

    const hci_t* hci_interface,

    const hci_packet_factory_t* packet_factory_interface,

    const hci_packet_parser_t* packet_parser_interface);

system/device/src/controller.cc

+0 −10
Original line number Diff line number Diff line
@@ -842,13 +842,3 @@ const controller_t* controller_get_interface() { 
    return controller_get_interface_legacy();

  }

}
 


const controller_t* controller_get_test_interface(

    const hci_t* hci_interface,

    const hci_packet_factory_t* packet_factory_interface,

    const hci_packet_parser_t* packet_parser_interface) {

  local_hci = hci_interface;

  packet_factory = packet_factory_interface;

  packet_parser = packet_parser_interface;

  return &interface;

}

system/hci/include/hci_layer.h

+0 −5
Original line number Diff line number Diff line
@@ -86,10 +86,5 @@ typedef struct hci_t { 


const hci_t* hci_layer_get_interface();



const hci_t* hci_layer_get_test_interface(

    const allocator_t* buffer_allocator_interface,

    const btsnoop_t* btsnoop_interface,

    const packet_fragmenter_t* packet_fragmenter_interface);



void hci_layer_cleanup_interface();

bool hci_is_root_inflammation_event_received();

system/hci/src/hci_layer.cc

+1 −17
Original line number Diff line number Diff line
@@ -903,21 +903,5 @@ const hci_t* hci_layer_get_interface_legacy() { 
}



const hci_t* hci_layer_get_interface() {

  if (bluetooth::shim::is_gd_hci_enabled()) {

  return bluetooth::shim::hci_layer_get_interface();

  } else {

    return hci_layer_get_interface_legacy();

  }

}



const hci_t* hci_layer_get_test_interface(

    const allocator_t* buffer_allocator_interface,

    const btsnoop_t* btsnoop_interface,

    const packet_fragmenter_t* packet_fragmenter_interface) {

  buffer_allocator = buffer_allocator_interface;

  btsnoop = btsnoop_interface;

  packet_fragmenter = packet_fragmenter_interface;



  init_layer_interface();

  return &interface;

}

system/hci/test/other_stack_stub.cc

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ void DumpBtScheduling(unsigned char, unsigned char*) {} 


namespace shim {



bool is_gd_hci_enabled() { return false; }

bool is_gd_shim_enabled() { return false; }

bool is_gd_stack_started_up() { return false; }

void Post(base::OnceClosure task) {}