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

Commit 3a6accf5 authored by Zach Johnson's avatar Zach Johnson
Browse files

Flatten btu_free_core and remove btu_init.cc 

bye

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9e93cf4e8f11df4ea7de6394479250db945dac60
parent 2d52d8be

system/btif/src/stack_manager.cc

+4 −1
Original line number Diff line number Diff line
@@ -299,7 +299,10 @@ static void event_shut_down_stack(UNUSED_ATTR void* context) { 


  module_clean_up(get_module(BTE_LOGMSG_MODULE));



  btu_free_core();

  gatt_free();

  l2c_free();

  sdp_free();

  btm_free();



  module_shut_down(get_module(CONTROLLER_MODULE));  // Doesn't do any work, just

                                                    // puts it in a restartable

system/stack/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ cc_library_static { 
        "btm/btm_sco.cc",

        "btm/btm_sec.cc",

        "btu/btu_hcif.cc",

        "btu/btu_init.cc",

        "btu/btu_task.cc",

        "gap/gap_ble.cc",

        "gap/gap_conn.cc",

system/stack/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ static_library("stack") { 
    "btm/btm_sco.cc",

    "btm/btm_sec.cc",

    "btu/btu_hcif.cc",

    "btu/btu_init.cc",

    "btu/btu_task.cc",

    "gap/gap_ble.cc",

    "gap/gap_conn.cc",

system/stack/btu/btu_init.cc

deleted100644 → 0
+0 −51
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.

 *

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



#define LOG_TAG "bt_task"



#include <base/logging.h>



#include "bt_target.h"

#include "btm_int.h"

#include "btu.h"

#include "common/message_loop_thread.h"

#include "device/include/controller.h"

#include "gatt_api.h"

#include "l2c_api.h"

#include "sdpint.h"



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

 *

 * Function         btu_free_core

 *

 * Description      Releases control block memory for each core component.

 *

 *

 * Returns          void

 *

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

void btu_free_core() {

  /* Free the mandatory core stack components */

  gatt_free();



  l2c_free();



  sdp_free();



  btm_free();

}

system/stack/include/btu.h

+0 −5
Original line number Diff line number Diff line
@@ -49,11 +49,6 @@ void btu_hcif_send_cmd_with_cb(const base::Location& posted_from, 
                               uint8_t params_len,

                               base::OnceCallback<void(uint8_t*, uint16_t)> cb);



/* Functions provided by btu_init.cc

 ***********************************

*/

void btu_free_core(void);



/* Functions provided by btu_task.cc

 ***********************************

*/