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

Commit a26c1010 authored by Zach Johnson's avatar Zach Johnson
Browse files

Inline bte_main_enable 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1ce27a478eac9e79c599d83ca3ebecba7ea9b83d
parent d4314e54

system/btif/include/btif_common.h

+0 −1
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ void btif_remote_properties_evt(bt_status_t status, RawAddress* remote_addr, 


void bte_load_did_conf(const char* p_path);

void bte_main_boot_entry(void);

void bte_main_enable(void);

void bte_main_disable(void);

void bte_main_cleanup(void);

void bte_main_postload_cfg(void);

system/btif/src/stack_manager.cc

+14 −2
Original line number Diff line number Diff line
@@ -28,10 +28,12 @@ 
#include "btif_common.h"

#include "common/message_loop_thread.h"

#include "device/include/controller.h"

#include "hci/include/btsnoop.h"

#include "main/shim/shim.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/semaphore.h"

#include "stack/include/btu.h"



// Temp includes

#include "bt_utils.h"
@@ -150,8 +152,18 @@ static void event_start_up_stack(UNUSED_ATTR void* context) { 
  future_t* local_hack_future = future_new();

  hack_future = local_hack_future;



  // Include this for now to put btif config into a shutdown-able state

  bte_main_enable();

  if (bluetooth::shim::is_any_gd_enabled()) {

    LOG_INFO("%s Gd shim module enabled", __func__);

    module_shut_down(get_module(GD_IDLE_MODULE));

    module_start_up(get_module(GD_SHIM_MODULE));

    module_start_up(get_module(BTIF_CONFIG_MODULE));

  } else {

    module_start_up(get_module(BTIF_CONFIG_MODULE));

    module_start_up(get_module(BTSNOOP_MODULE));

    module_start_up(get_module(HCI_MODULE));

  }



  BTU_StartUp();



  if (future_await(local_hack_future) != FUTURE_SUCCESS) {

    LOG_ERROR("%s failed to start up the stack", __func__);

system/main/bte_main.cc

+0 −27
Original line number Diff line number Diff line
@@ -130,33 +130,6 @@ void bte_main_cleanup() { 
  module_clean_up(get_module(INTEROP_MODULE));

}



/******************************************************************************

 *

 * Function         bte_main_enable

 *

 * Description      BTE MAIN API - Creates all the BTE tasks. Should be called

 *                  part of the Bluetooth stack enable sequence

 *

 * Returns          None

 *

 *****************************************************************************/

void bte_main_enable() {

  APPL_TRACE_DEBUG("%s", __func__);



  if (bluetooth::shim::is_any_gd_enabled()) {

    LOG_INFO("%s Gd shim module enabled", __func__);

    module_shut_down(get_module(GD_IDLE_MODULE));

    module_start_up(get_module(GD_SHIM_MODULE));

    module_start_up(get_module(BTIF_CONFIG_MODULE));

  } else {

    module_start_up(get_module(BTIF_CONFIG_MODULE));

    module_start_up(get_module(BTSNOOP_MODULE));

    module_start_up(get_module(HCI_MODULE));

  }



  BTU_StartUp();

}



/******************************************************************************

 *

 * Function         bte_main_disable