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

Commit 05bd6403 authored by Zach Johnson's avatar Zach Johnson
Browse files

Flatten BTE_InitStack 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia09d7c99b50284bdb4c788f29d65c4d9e07dc917
parent 4213672c

system/btif/src/stack_manager.cc

+29 −1
Original line number Diff line number Diff line
@@ -40,11 +40,26 @@ 
#include "bta/sys/bta_sys.h"

#include "btif_config.h"

#include "btif_profile_queue.h"

#include "internal_include/bt_target.h"

#include "internal_include/bte.h"

#include "stack/btm/btm_int.h"

#include "stack/include/gatt_api.h"

#include "stack/include/l2c_api.h"

#include "stack/include/port_api.h"

#include "stack/sdp/sdpint.h"

#if (BNEP_INCLUDED == TRUE)

#include "stack/include/bnep_api.h"

#endif

#include "stack/include/gap_api.h"

#if (PAN_INCLUDED == TRUE)

#include "stack/include/pan_api.h"

#endif

#include "stack/include/a2dp_api.h"

#include "stack/include/avrc_api.h"

#if (HID_HOST_INCLUDED == TRUE)

#include "stack/include/hidh_api.h"

#endif

#include "stack/include/smp_api.h"



using bluetooth::common::MessageLoopThread;
@@ -180,7 +195,20 @@ static void event_start_up_stack(UNUSED_ATTR void* context) { 
  SMP_Init();

  btm_ble_init();



  BTE_InitStack();

  RFCOMM_Init();

#if (BNEP_INCLUDED == TRUE)

  BNEP_Init();

#if (PAN_INCLUDED == TRUE)

  PAN_Init();

#endif /* PAN */

#endif /* BNEP Included */

  A2DP_Init();

  AVRC_Init();

  GAP_Init();

#if (HID_HOST_INCLUDED == TRUE)

  HID_HostInit();

#endif



  bta_sys_init();

  module_init(get_module(BTE_LOGMSG_MODULE));

system/main/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ filegroup { 
    name: "LibBluetoothSources",

    srcs: [

        "bte_conf.cc",

        "bte_init.cc",

        "bte_init_cpp_logging.cc",

        "bte_logmsg.cc",

        "bte_main.cc",

system/main/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ shared_library("bluetooth") { 
  # platform specific

  sources += [

    "bte_conf.cc",

    "bte_init.cc",

    "bte_init_cpp_logging.cc",

    "bte_logmsg.cc",

    "bte_main.cc",

system/main/bte_init.cc

deleted100644 → 0
+0 −103
Original line number Diff line number Diff line 
/******************************************************************************

 *

 *  Copyright 2000-2012 Broadcom Corporation

 *

 *  Licensed under the Apache License, Version 2.0 (the "License");

 *  you may not use this file except in compliance with the License.

 *  You may obtain a copy of the License at:

 *

 *  http://www.apache.org/licenses/LICENSE-2.0

 *

 *  Unless required by applicable law or agreed to in writing, software

 *  distributed under the License is distributed on an "AS IS" BASIS,

 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 *

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



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

 *

 *  This module contains the routines that initialize the stack components.

 *  It must be called before the BTU task is started.

 *

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



#include <string.h>

#include "bt_target.h"



#include "bte.h"



/* Include initialization functions definitions */

#include "port_api.h"



#if (BNEP_INCLUDED == TRUE)

#include "bnep_api.h"

#endif



#include "gap_api.h"



#if (PAN_INCLUDED == TRUE)

#include "pan_api.h"

#endif



#include "avrc_api.h"

#include "a2dp_api.h"



#if (HID_HOST_INCLUDED == TRUE)

#include "hidh_api.h"

#endif



#include "gatt_api.h"

#include "smp_api.h"



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

 *                          F U N C T I O N S                                *

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



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

 *

 * Function         BTE_InitStack

 *

 * Description      Initialize control block memory for each component.

 *

 *                  Note: The core stack components must be called

 *                      before creating the BTU Task.  The rest of the

 *                      components can be initialized at a later time if desired

 *                      as long as the component's init function is called

 *                      before accessing any of its functions.

 *

 * Returns          void

 *

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

void BTE_InitStack(void) {

  /* Initialize the optional stack components */

  RFCOMM_Init();



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

 * BNEP and its profiles **

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

#if (BNEP_INCLUDED == TRUE)

  BNEP_Init();



#if (PAN_INCLUDED == TRUE)

  PAN_Init();

#endif /* PAN */

#endif /* BNEP Included */



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

 * AVDT and its profiles **

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

  A2DP_Init();



  AVRC_Init();



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

   * Others **

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

  GAP_Init();



#if (HID_HOST_INCLUDED == TRUE)

  HID_HostInit();

#endif

}