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

Commit 5fc3ccd4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Remove HCI_MODULE" am: 7fb87371 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1822165

Change-Id: I134b1727ced4bae003bcf9927036d89cc7a5c51f
parents d8bd11c3 7fb87371

system/btif/src/stack_manager.cc

+0 −3
Original line number Original line Diff line number Diff line
@@ -179,7 +179,6 @@ const struct module_lookup module_table[] = { 
    {CONTROLLER_MODULE, &controller_module},

    {CONTROLLER_MODULE, &controller_module},

    {GD_IDLE_MODULE, &gd_idle_module},

    {GD_IDLE_MODULE, &gd_idle_module},

    {GD_SHIM_MODULE, &gd_shim_module},

    {GD_SHIM_MODULE, &gd_shim_module},

    {HCI_MODULE, &hci_module},

    {INTEROP_MODULE, &interop_module},

    {INTEROP_MODULE, &interop_module},

    {OSI_MODULE, &osi_module},

    {OSI_MODULE, &osi_module},

    {STACK_CONFIG_MODULE, &stack_config_module},

    {STACK_CONFIG_MODULE, &stack_config_module},
@@ -266,7 +265,6 @@ static void event_start_up_stack(UNUSED_ATTR void* context) { 
  } else {

  } else {

    module_start_up(get_local_module(BTIF_CONFIG_MODULE));

    module_start_up(get_local_module(BTIF_CONFIG_MODULE));

    module_start_up(get_local_module(BTSNOOP_MODULE));

    module_start_up(get_local_module(BTSNOOP_MODULE));

    module_start_up(get_local_module(HCI_MODULE));

  }

  }





  get_btm_client_interface().lifecycle.btm_init();

  get_btm_client_interface().lifecycle.btm_init();
@@ -370,7 +368,6 @@ static void event_shut_down_stack(UNUSED_ATTR void* context) { 
    module_shut_down(get_local_module(GD_SHIM_MODULE));

    module_shut_down(get_local_module(GD_SHIM_MODULE));

    module_start_up(get_local_module(GD_IDLE_MODULE));

    module_start_up(get_local_module(GD_IDLE_MODULE));

  } else {

  } else {

    module_shut_down(get_local_module(HCI_MODULE));

    module_shut_down(get_local_module(BTSNOOP_MODULE));

    module_shut_down(get_local_module(BTSNOOP_MODULE));

  }

  }

system/device/src/controller.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -320,7 +320,7 @@ EXPORT_SYMBOL extern const module_t controller_module = { 
    .start_up = start_up,

    .start_up = start_up,

    .shut_down = shut_down,

    .shut_down = shut_down,

    .clean_up = NULL,

    .clean_up = NULL,

    .dependencies = {HCI_MODULE, NULL}};

    .dependencies = {NULL}};





// Interface functions

// Interface functions

system/hci/include/hci_layer.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include "osi/include/osi.h"  // INVALID_FD

#include "osi/include/osi.h"  // INVALID_FD

#include "stack/include/bt_types.h"

#include "stack/include/bt_types.h"





static const char HCI_MODULE[] = "hci_module";



///// LEGACY DEFINITIONS /////

///// LEGACY DEFINITIONS /////





/* Message event mask across Host/Controller lib and stack */

/* Message event mask across Host/Controller lib and stack */