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

Commit 1dd4bf63 authored by Chienyuan Huang's avatar Chienyuan Huang Committed by Gerrit Code Review
Browse files

Merge "CS: Update PDL based on core spec 6.0" into main

parents 82bae21a d3f25d5e

system/gd/hci/distance_measurement_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ struct DistanceMeasurementManager::impl : bluetooth::hal::RangingHalCallback { 
                    connection_handle, config_id, CsCreateContext::BOTH_LOCAL_AND_REMOTE_CONTROLLER,

                    CsMainModeType::MODE_2, CsSubModeType::UNUSED, kMinMainModeSteps,

                    kMaxMainModeSteps, kMainModeRepetition, kMode0Steps, CsRole::INITIATOR,

                    CsConfigRttType::RTT_AA_COARSE, CsSyncPhy::LE_1M_PHY, channel_map,

                    CsConfigRttType::RTT_AA_ONLY, CsSyncPhy::LE_1M_PHY, channel_map,

                    kChannelMapRepetition, CsChannelSelectionType::TYPE_3B, CsCh3cShape::HAT_SHAPE,

                    kCh3cJump),

            handler_->BindOnceOn(this, &impl::on_cs_setup_command_status_cb, connection_handle));

system/pdl/hci/hci_packets.pdl

+7 −6
Original line number Diff line number Diff line
@@ -4954,7 +4954,7 @@ struct CsOptionalCsSyncPhysSupported { 
}



struct CsOptionalSubfeaturesSupported {

  companion_signal : 1,

  _reserved_ : 1,

  frequency_actuation_error : 1,

  channel_selection_algorithm : 1,

  phase_based_ranging : 1,
@@ -5140,7 +5140,7 @@ enum CsRole : 8 { 
}



enum CsConfigRttType : 8 {

  RTT_AA_COARSE = 0x00,

  RTT_AA_ONLY = 0x00,

  RTT_WITH_32_BIT_SOUNDING_SEQUENCE = 0x01,

  RTT_WITH_96_BIT_SOUNDING_SEQUENCE = 0x02,

  RTT_WITH_32_BIT_RANDOM_SEQUENCE = 0x03,
@@ -6890,6 +6890,7 @@ packet LeCsProcedureEnableComplete : LeMetaEvent (subevent_code = LE_CS_PROCEDUR 
  event_interval : 16,

  procedure_interval : 16,

  procedure_count : 16,

  max_procedure_len : 16,

}



struct LeCsMode0InitatorData {
@@ -6975,8 +6976,8 @@ struct LeCsMode3InitatorData { 
  packet_quality : 8,

  packet_nadm : CsPacketNadm,

  packet_rssi : 8,

  packet_antenna : 8,

  toa_tod_initiator : 16,

  packet_antenna : 8,

  antenna_permutation_index : 8,

  tone_data : LeCsToneDataWithQuality[],

}
@@ -6986,10 +6987,10 @@ struct LeCsMode3InitatorDataWithPacketPct { 
  packet_quality : 8,

  packet_nadm : CsPacketNadm,

  packet_rssi : 8,

  toa_tod_initiator : 16,

  packet_antenna : 8,

  packet_pct1 : LeCsToneData,

  packet_pct2 : LeCsToneData,

  toa_tod_initiator : 16,

  antenna_permutation_index : 8,

  tone_data : LeCsToneDataWithQuality[],

}
@@ -6999,8 +7000,8 @@ struct LeCsMode3ReflectorData { 
  packet_quality : 8,

  packet_nadm : CsPacketNadm,

  packet_rssi : 8,

  packet_antenna : 8,

  tod_toa_reflector : 16,

  packet_antenna : 8,

  antenna_permutation_index : 8,

  tone_data : LeCsToneDataWithQuality[],

}
@@ -7010,10 +7011,10 @@ struct LeCsMode3ReflectorDataWithPacketPct { 
  packet_quality : 8,

  packet_nadm : CsPacketNadm,

  packet_rssi : 8,

  tod_toa_reflector : 16,

  packet_antenna : 8,

  packet_pct1 : LeCsToneData,

  packet_pct2 : LeCsToneData,

  tod_toa_reflector : 16,

  antenna_permutation_index : 8,

  tone_data : LeCsToneDataWithQuality[],

}