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

Commit 24e3a916 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Re-include stack/rfcomm am: d821f156 am: e290ef30 am: f7a1c90a 

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

Change-Id: I7668ed36f267ea3e57c56ffe1519d8468963ff4a
parents cb7f3f01 f7a1c90a

system/stack/rfcomm/port_api.cc

+6 −11
Original line number Diff line number Diff line
@@ -25,20 +25,15 @@ 
#define LOG_TAG "bt_port_api"



#include <base/logging.h>

#include <string.h>

#include <cstdint>



#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/mutex.h"



#include "bt_common.h"

#include "l2c_api.h"

#include "port_api.h"

#include "port_int.h"

#include "rfc_int.h"

#include "rfcdefs.h"

#include "sdp_api.h"



#include "stack/include/btm_api_types.h"

#include "stack/include/port_api.h"

#include "stack/include/sdpdefs.h"

#include "stack/rfcomm/rfc_int.h"

#include "types/raw_address.h"



#define error(fmt, ...) \

  LOG_ERROR("## ERROR : %s: " fmt "##", __func__, ##__VA_ARGS__)

system/stack/rfcomm/port_int.h

+6 −5
Original line number Diff line number Diff line
@@ -25,13 +25,14 @@ 
#ifndef PORT_INT_H

#define PORT_INT_H



#include "bt_common.h"

#include "bt_target.h"

#include "l2c_api.h"

#include <cstdint>



#include "osi/include/alarm.h"

#include "osi/include/fixed_queue.h"

#include "port_api.h"

#include "rfcdefs.h"

#include "stack/include/l2c_api.h"

#include "stack/include/port_api.h"

#include "stack/include/rfcdefs.h"

#include "types/raw_address.h"



/*

 * Flow control configuration values for the mux

system/stack/rfcomm/port_rfc.cc

+10 −11
Original line number Diff line number Diff line
@@ -22,20 +22,19 @@ 
 *  communications

 *

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

#include <base/logging.h>

#include <string.h>



#include "osi/include/mutex.h"

#include "osi/include/osi.h"

#include <base/logging.h>

#include <cstdint>

#include <string>



#include "bt_common.h"

#include "bt_target.h"

#include "bt_utils.h"

#include "btm_api.h"

#include "port_api.h"

#include "port_int.h"

#include "rfc_int.h"

#include "rfcdefs.h"

#include "bt_trace.h"

#include "osi/include/allocator.h"

#include "osi/include/mutex.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "stack/include/sdpdefs.h"

#include "stack/rfcomm/port_int.h"

#include "stack/rfcomm/rfc_int.h"



/*

 * Local function definitions

system/stack/rfcomm/port_utils.cc

+8 −11
Original line number Diff line number Diff line
@@ -21,21 +21,18 @@ 
 *  Port Emulation entity utilities

 *

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

#include <base/logging.h>

#include <string.h>



#include "osi/include/mutex.h"

#include <base/logging.h>

#include <cstdint>

#include <cstring>



#include "bt_common.h"

#include "bt_target.h"

#include "btm_int.h"

#include "btu.h"

#include "l2cdefs.h"

#include "port_api.h"

#include "port_int.h"

#include "rfc_int.h"

#include "rfcdefs.h"

#include "osi/include/allocator.h"

#include "osi/include/mutex.h"

#include "stack/include/btm_client_interface.h"

#include "stack/rfcomm/port_int.h"

#include "stack/rfcomm/rfc_int.h"

#include "types/raw_address.h"



static const tPORT_STATE default_port_pars = {

    PORT_BAUD_RATE_9600,

system/stack/rfcomm/rfc_int.h

+6 −4
Original line number Diff line number Diff line
@@ -25,12 +25,14 @@ 
#ifndef RFC_INT_H

#define RFC_INT_H



#include "l2c_api.h"

#include "port_int.h"

#include "stack/include/btm_status.h"



#include <cstdint>

#include <cstring>

#include <unordered_map>



#include "stack/include/btm_status.h"

#include "stack/include/l2c_api.h"

#include "stack/rfcomm/port_int.h"



/*

 * Define RFCOMM result codes

*/