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

Commit ca6523b8 authored Nov 15, 2022 by Henri Chataing Committed by Automerger Merge Worker Nov 15, 2022

Merge "gd: Fix declaration of LeBigCreateSync in hci_packets.pdl" am: be719ab3 am: ad83869b

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

Change-Id: Ib95f66ddd6ee38688f8b7ec5586b36f1139e3bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 624604e0 ad83869b

system/gd/hci/hci_packets.pdl

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4445,7 +4445,7 @@ packet LeCreateBig : LeIsoCommand (op_code = LE_CREATE_BIG) {
	packing : Packing,		packing : Packing,
	framing : Enable,		framing : Enable,
	encryption : Enable,		encryption : Enable,
	broadcast_code: 16[],		broadcast_code: 8[16],
	}		}

	packet LeCreateBigStatus : CommandStatus (command_op_code = LE_CREATE_BIG) {		packet LeCreateBigStatus : CommandStatus (command_op_code = LE_CREATE_BIG) {
	@@ -4464,7 +4464,7 @@ packet LeBigCreateSync : LeIsoCommand (op_code = LE_BIG_CREATE_SYNC) {
	sync_handle : 12,		sync_handle : 12,
	_reserved_ : 4,		_reserved_ : 4,
	encryption : Enable,		encryption : Enable,
	broadcast_code : 16[],		broadcast_code : 8[16],
	mse : 5,		mse : 5,
	_reserved_ : 3,		_reserved_ : 3,
	big_sync_timeout : 16,		big_sync_timeout : 16,

tools/rootcanal/model/controller/link_layer_controller.cc

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5974,7 +5974,7 @@ ErrorCode LinkLayerController::LeCreateBig(
	bluetooth::hci::SecondaryPhyType /* phy */,		bluetooth::hci::SecondaryPhyType /* phy */,
	bluetooth::hci::Packing /* packing /, bluetooth::hci::Enable / framing */,		bluetooth::hci::Packing /* packing /, bluetooth::hci::Enable / framing */,
	bluetooth::hci::Enable /* encryption */,		bluetooth::hci::Enable /* encryption */,
	std::vector<uint16_t> /* broadcast_code */) {		std::array<uint8_t, 16> /* broadcast_code */) {
	return ErrorCode::SUCCESS;		return ErrorCode::SUCCESS;
	}		}

	@@ -5986,7 +5986,7 @@ ErrorCode LinkLayerController::LeTerminateBig(uint8_t /* big_handle */,
	ErrorCode LinkLayerController::LeBigCreateSync(		ErrorCode LinkLayerController::LeBigCreateSync(
	uint8_t /* big_handle /, uint16_t / sync_handle */,		uint8_t /* big_handle /, uint16_t / sync_handle */,
	bluetooth::hci::Enable /* encryption */,		bluetooth::hci::Enable /* encryption */,
	std::vector<uint16_t> /* broadcast_code /, uint8_t / mse */,		std::array<uint8_t, 16> /* broadcast_code /, uint8_t / mse */,
	uint16_t /* big_sync_timeout /, std::vector<uint8_t> / bis */) {		uint16_t /* big_sync_timeout /, std::vector<uint8_t> / bis */) {
	return ErrorCode::SUCCESS;		return ErrorCode::SUCCESS;
	}		}

tools/rootcanal/model/controller/link_layer_controller.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -271,12 +271,13 @@ class LinkLayerController {
	uint32_t sdu_interval, uint16_t max_sdu, uint16_t max_transport_latency,		uint32_t sdu_interval, uint16_t max_sdu, uint16_t max_transport_latency,
	uint8_t rtn, bluetooth::hci::SecondaryPhyType phy,		uint8_t rtn, bluetooth::hci::SecondaryPhyType phy,
	bluetooth::hci::Packing packing, bluetooth::hci::Enable framing,		bluetooth::hci::Packing packing, bluetooth::hci::Enable framing,
	bluetooth::hci::Enable encryption, std::vector<uint16_t> broadcast_code);		bluetooth::hci::Enable encryption,
			std::array<uint8_t, 16> broadcast_code);
	bluetooth::hci::ErrorCode LeTerminateBig(uint8_t big_handle,		bluetooth::hci::ErrorCode LeTerminateBig(uint8_t big_handle,
	bluetooth::hci::ErrorCode reason);		bluetooth::hci::ErrorCode reason);
	bluetooth::hci::ErrorCode LeBigCreateSync(		bluetooth::hci::ErrorCode LeBigCreateSync(
	uint8_t big_handle, uint16_t sync_handle,		uint8_t big_handle, uint16_t sync_handle,
	bluetooth::hci::Enable encryption, std::vector<uint16_t> broadcast_code,		bluetooth::hci::Enable encryption, std::array<uint8_t, 16> broadcast_code,
	uint8_t mse, uint16_t big_syunc_timeout, std::vector<uint8_t> bis);		uint8_t mse, uint16_t big_syunc_timeout, std::vector<uint8_t> bis);
	void LeBigTerminateSync(uint8_t big_handle);		void LeBigTerminateSync(uint8_t big_handle);
	bluetooth::hci::ErrorCode LeRequestPeerSca(uint16_t request_handle);		bluetooth::hci::ErrorCode LeRequestPeerSca(uint16_t request_handle);