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

Commit c2cda7ff authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "gd: Patch HCI pdl definitions for ISO commands and events" am: a3953437 

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



Change-Id: Ibdadcc05f7a99bd33c8d23014a4cfce5e9048a2a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f717da8 a3953437

system/gd/hci/hci_packets.pdl

+5 −5
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ enum OpCodeIndex : 16 { 
  LE_READ_BUFFER_SIZE_V2 = 415,

  LE_READ_ISO_TX_SYNC = 416,

  LE_SET_CIG_PARAMETERS = 417,

  LE_SET_CIG_PARAMETERS_TEST = 418,

  LE_SET_CIG_PARAMETERS_TEST = 420,

  LE_CREATE_CIS = 421,

  LE_REMOVE_CIG = 422,

  LE_ACCEPT_CIS_REQUEST = 423,
@@ -4483,7 +4483,7 @@ packet LeSetCigParameters : LeIsoCommand (op_code = LE_SET_CIG_PARAMETERS) { 
  cig_id : 8,

  sdu_interval_m_to_s : 24,

  sdu_interval_s_to_m : 24,

  peripherals_clock_accuracy : ClockAccuracy,

  worst_case_sca : ClockAccuracy,

  packing : Packing,

  framing : Enable,

  max_transport_latency_m_to_s : 16,
@@ -4519,7 +4519,7 @@ packet LeSetCigParametersTest : LeIsoCommand (op_code = LE_SET_CIG_PARAMETERS_TE 
  ft_m_to_s : 8,

  ft_s_to_m : 8,

  iso_interval : 16,

  peripherals_clock_accuracy : ClockAccuracy,

  worst_case_sca : ClockAccuracy,

  packing : Packing,

  framing : Enable,

  _count_(cis_config) : 8,
@@ -6414,7 +6414,7 @@ enum IsoPacketStatusFlag : 2 { 
packet IsoWithTimestamp : Iso (ts_flag = PRESENT) {

  time_stamp : 32,

  packet_sequence_number : 16,

  _size_(_payload_) : 12, // iso_sdu_length

  iso_sdu_length : 12,

  _reserved_ : 2,

  packet_status_flag : IsoPacketStatusFlag,

  _payload_,
@@ -6422,7 +6422,7 @@ packet IsoWithTimestamp : Iso (ts_flag = PRESENT) { 


packet IsoWithoutTimestamp : Iso (ts_flag = NOT_PRESENT) {

  packet_sequence_number : 16,

  _size_(_payload_) : 12, // iso_sdu_length

  iso_sdu_length : 12,

  _reserved_ : 2,

  packet_status_flag : IsoPacketStatusFlag,

  _payload_,

system/gd/iso/internal/iso_manager_impl.cc

+2 −1
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ void IsoManagerImpl::SendIsoPacket(uint16_t cis_handle, std::vector<uint8_t> pac 
      cis_handle,

      hci::IsoPacketBoundaryFlag::COMPLETE_SDU,

      0 /* sequence_number */,

      packet.size() /* iso_sdu_length */,

      hci::IsoPacketStatusFlag::VALID,

      std::make_unique<bluetooth::packet::RawBuilder>(packet));

  LOG_INFO("%c%c", packet[0], packet[1]);