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

Commit 6b3d9342 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

IA2: Split btu event and btu task am: f81cac87 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2761087



Change-Id: I001a5ffde41a5947821a08967a3426e27e1bd805
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 652965da f81cac87

system/stack/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ cc_library_static { 
        "btm/btm_sco_hci.cc",

        "btm/btm_sco_hfp_hal.cc",

        "btm/btm_sec.cc",

        "btu/btu_event.cc",

        "btu/btu_hcif.cc",

        "btu/btu_task.cc",

        "eatt/eatt.cc",
@@ -1713,6 +1714,7 @@ cc_test { 
        ":TestMockStackL2cap",

        ":TestMockStackMetrics",

        ":TestMockStackSmp",

        "btu/btu_event.cc",

        "btu/btu_hcif.cc",

        "btu/btu_task.cc",

        "test/stack_btu_test.cc",

system/stack/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ source_set("stack") { 
    "btm/btm_sec.cc",

    "btm/hfp_msbc_encoder.cc",

    "btm/hfp_msbc_decoder.cc",

    "btu/btu_event.cc",

    "btu/btu_hcif.cc",

    "btu/btu_task.cc",

    "eatt/eatt.cc",

system/stack/btu/btu_event.cc

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 * 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.

 */



#include "btm_iso_api.h"

#include "osi/include/allocator.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btu_hcif.h"



using bluetooth::hci::IsoManager;



/* Define BTU storage area */

uint8_t btu_trace_level = HCI_INITIAL_TRACE_LEVEL;



void btu_hci_msg_process(BT_HDR* p_msg) {

  /* Determine the input message type. */

  switch (p_msg->event & BT_EVT_MASK) {

    case BT_EVT_TO_BTU_HCI_EVT:

      btu_hcif_process_event((uint8_t)(p_msg->event & BT_SUB_EVT_MASK), p_msg);

      osi_free(p_msg);

      break;



    case BT_EVT_TO_BTU_HCI_ISO:

      IsoManager::GetInstance()->HandleIsoData(p_msg);

      osi_free(p_msg);

      break;



    default:

      osi_free(p_msg);

      break;

  }

}

system/stack/btu/btu_task.cc

+2 −37
Original line number Diff line number Diff line
@@ -22,51 +22,16 @@ 
#include <base/logging.h>

#include <base/run_loop.h>

#include <base/threading/thread.h>

#include <pthread.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>



#include "bta/sys/bta_sys.h"

#include "btcore/include/module.h"

#include "btif/include/btif_common.h"

#include "btm_iso_api.h"

#include "common/message_loop_thread.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/acl_hci_link_interface.h"

#include "stack/include/bt_hdr.h"

#include "include/hardware/bluetooth.h"

#include "os/log.h"

#include "stack/include/btu.h"

#include "stack/include/btu_hcif.h"



using bluetooth::common::MessageLoopThread;

using bluetooth::hci::IsoManager;



/* Define BTU storage area */

uint8_t btu_trace_level = HCI_INITIAL_TRACE_LEVEL;



static MessageLoopThread main_thread("bt_main_thread");



void btu_hci_msg_process(BT_HDR* p_msg) {

  /* Determine the input message type. */

  switch (p_msg->event & BT_EVT_MASK) {

    case BT_EVT_TO_BTU_HCI_EVT:

      btu_hcif_process_event((uint8_t)(p_msg->event & BT_SUB_EVT_MASK), p_msg);

      osi_free(p_msg);

      break;



    case BT_EVT_TO_BTU_HCI_ISO:

      IsoManager::GetInstance()->HandleIsoData(p_msg);

      osi_free(p_msg);

      break;



    default:

      osi_free(p_msg);

      break;

  }

}



bluetooth::common::MessageLoopThread* get_main_thread() { return &main_thread; }



bt_status_t do_in_main_thread(const base::Location& from_here,

system/stack/include/btu.h

+1 −20
Original line number Diff line number Diff line
@@ -27,30 +27,11 @@ 
#ifndef BTU_H

#define BTU_H



#include <base/functional/callback.h>

#include <base/location.h>

#include <base/threading/thread.h>



#include <cstdint>



#include "bt_target.h"

#include "common/message_loop_thread.h"

#include "osi/include/alarm.h"

#include "stack/include/btu_task.h"



/* Global BTU data */

extern uint8_t btu_trace_level;



/* Functions provided by btu_task.cc

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

*/

bluetooth::common::MessageLoopThread* get_main_thread();

bt_status_t do_in_main_thread(const base::Location& from_here,

                              base::OnceClosure task);

bt_status_t do_in_main_thread_delayed(const base::Location& from_here,

                                      base::OnceClosure task,

                                      const base::TimeDelta& delay);



using BtMainClosure = std::function<void()>;

void post_on_bt_main(BtMainClosure closure);



#endif