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

Commit 0fe344d4 authored by Chris Manton's avatar Chris Manton
Browse files

IA2: Introduce bt_lap type 

5.4::6.3.3.1 Synchronization word definition

We denote the 24 bit
lower address part (LAP) of the Bluetooth Device Address

Bug: 305310502
Test: m .

Change-Id: I13006643748272a66b39ef6062195b3f714c6af4
parent 9fab9d58

system/stack/btm/btm_inq.cc

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "common/time_util.h"

#include "device/include/controller.h"

#include "main/shim/shim.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"
@@ -49,6 +50,7 @@ 
#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_lap.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_ble_api.h"

system/stack/hcic/hcicmds.cc

+2 −5
Original line number Diff line number Diff line
@@ -23,23 +23,20 @@ 
 *

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



#include <base/functional/bind.h>

#include <base/functional/callback_forward.h>

#include <stddef.h>

#include <string.h>



#include "bt_target.h"

#include "device/include/device_iot_config.h"

#include "device/include/esco_parameters.h"

#include "gd/common/init_flags.h"

#include "hcidefs.h"

#include "hcimsgs.h"

#include "main/shim/acl_api.h"

#include "osi/include/allocator.h"

#include "stack/include/acl_hci_link_interface.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_lap.h"

#include "stack/include/bt_octets.h"

#include "stack/include/btu_hcif.h"

#include "stack/include/main_thread.h"

#include "types/raw_address.h"



/* Message by message.... */

system/stack/include/bt_lap.h

0 → 100644
+22 −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.

 */



#pragma once



#include <cstdint>



#define LAP_LEN 3

typedef uint8_t LAP[LAP_LEN]; /* IAC as passed to Inquiry (LAP) */

system/stack/include/bt_types.h

+0 −3
Original line number Diff line number Diff line
@@ -298,9 +298,6 @@ 


/* Common Bluetooth field definitions */



#define LAP_LEN 3

typedef uint8_t LAP[LAP_LEN];     /* IAC as passed to Inquiry (LAP) */



#define BT_1SEC_TIMEOUT_MS (1 * 1000) /* 1 second */



#endif

system/stack/include/hcimsgs.h

+1 −2
Original line number Diff line number Diff line
@@ -23,9 +23,8 @@ 


#include <cstdint>



#include "bt_target.h"

#include "device/include/esco_parameters.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_lap.h"

#include "stack/include/bt_name.h"

#include "stack/include/bt_octets.h"

#include "stack/include/btm_api_types.h"