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

Commit 09f66941 authored by Steven Liu's avatar Steven Liu
Browse files

Revert "CS: Update PDL based on core spec 6.0" 

This reverts commit 14d18d53.

Reason for revert: <Measurement failed as the controller is not updated to the same packet structure.>

Flag: com.android.bluetooth.flags.channel_sounding_in_stack
Bug: 324185011
Bug: 373755855
Test: m com.android.btservice

Change-Id: If2df0dbba7ac4d8e7b13df910dcafa3c59607781
parent 14d18d53

system/gd/hci/distance_measurement_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,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_ONLY, CsSyncPhy::LE_1M_PHY, channel_map,

                    CsConfigRttType::RTT_AA_COARSE, 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

+2 −3
Original line number Diff line number Diff line
@@ -4943,7 +4943,7 @@ struct CsOptionalCsSyncPhysSupported { 
}



struct CsOptionalSubfeaturesSupported {

  _reserved_ : 1,

  companion_signal : 1,

  frequency_actuation_error : 1,

  channel_selection_algorithm : 1,

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



enum CsConfigRttType : 8 {

  RTT_AA_ONLY = 0x00,

  RTT_AA_COARSE = 0x00,

  RTT_WITH_32_BIT_SOUNDING_SEQUENCE = 0x01,

  RTT_WITH_96_BIT_SOUNDING_SEQUENCE = 0x02,

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

  procedure_interval : 16,

  procedure_count : 16,

  max_procedure_len : 16,

}



struct LeCsMode0InitatorData {