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

Commit 360c916b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "legacy: hci: Properly include stack/include/bt_hdr"

parents 5872e77c 7cee778b

system/hci/include/hci_layer.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 




#include "osi/include/future.h"

#include "osi/include/future.h"

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

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

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"

#include "stack/include/bt_types.h"





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

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

system/hci/src/hci_packet_parser.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "hci/include/buffer_allocator.h"

#include "hci/include/buffer_allocator.h"

#include "hci_layer.h"

#include "hci_layer.h"

#include "osi/include/log.h"

#include "osi/include/log.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/hcidefs.h"

#include "stack/include/hcidefs.h"





static const command_opcode_t NO_OPCODE_CHECKING = 0;

static const command_opcode_t NO_OPCODE_CHECKING = 0;

system/hci/src/packet_fragmenter.cc

+2 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 




#include <base/logging.h>

#include <base/logging.h>

#include <string.h>

#include <string.h>



#include <unordered_map>

#include <unordered_map>





#include "bt_target.h"

#include "bt_target.h"
@@ -30,6 +31,7 @@ 
#include "hci/include/buffer_allocator.h"

#include "hci/include/buffer_allocator.h"

#include "osi/include/log.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/osi.h"

#include "stack/include/bt_hdr.h"





// 2 bytes for handle, 2 bytes for data length (Volume 2, Part E, 5.4.2)

// 2 bytes for handle, 2 bytes for data length (Volume 2, Part E, 5.4.2)

#define HCI_ACL_PREAMBLE_SIZE 4

#define HCI_ACL_PREAMBLE_SIZE 4

system/hci/test/packet_fragmenter_host_test.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "hci/src/packet_fragmenter.cc"

#include "hci/src/packet_fragmenter.cc"

#include "osi/include/allocator.h"

#include "osi/include/allocator.h"

#include "osi/test/AllocationTestHarness.h"

#include "osi/test/AllocationTestHarness.h"

#include "stack/include/bt_hdr.h"





extern void allocation_tracker_uninit(void);

extern void allocation_tracker_uninit(void);

system/hci/test/packet_fragmenter_test.cc

+4 −4
Original line number Original line Diff line number Diff line
@@ -16,16 +16,16 @@ 
 *

 *

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

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





#include <gtest/gtest.h>

#include "hci/include/packet_fragmenter.h"



#include "AllocationTestHarness.h"





#include <gtest/gtest.h>

#include <stdint.h>

#include <stdint.h>





#include "AllocationTestHarness.h"

#include "device/include/controller.h"

#include "device/include/controller.h"

#include "hci/include/packet_fragmenter.h"

#include "osi/include/allocator.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "osi/include/osi.h"

#include "stack/include/bt_hdr.h"

#include "test_stubs.h"

#include "test_stubs.h"





#ifndef HCI_ACL_PREAMBLE_SIZE

#ifndef HCI_ACL_PREAMBLE_SIZE