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

Commit 46026ae8 authored by Myles Watson's avatar Myles Watson
Browse files

HCI: Remove deprecated TRACK command 

Bug: 175422340
Test: cert/run
Tag: #gd-refactor
Change-Id: I813f1737a5794ccf548bdf3e537d2b32f445d107
parent 4bb8e007

system/gd/hci/controller.cc

+0 −2
Original line number Diff line number Diff line
@@ -777,8 +777,6 @@ struct Controller::impl { 
        return vendor_capabilities_.total_scan_results_storage_ != 0x00;

      case OpCode::LE_ADV_FILTER:

        return vendor_capabilities_.filtering_support_ == 0x01;

      case OpCode::LE_TRACK_ADV:

        return vendor_capabilities_.total_num_of_advt_tracked_ > 0;

      case OpCode::LE_ENERGY_INFO:

        return vendor_capabilities_.activity_energy_info_support_ == 0x01;

      case OpCode::LE_EXTENDED_SCAN_PARAMS:

system/gd/hci/controller_test.cc

+0 −4
Original line number Diff line number Diff line
@@ -394,7 +394,6 @@ TEST_F(ControllerTest, is_supported_test) { 
TEST_F(ControllerTest, feature_spec_version_055_test) {

  EXPECT_EQ(controller_->GetVendorCapabilities().version_supported_, 55);

  EXPECT_TRUE(controller_->IsSupported(OpCode::LE_MULTI_ADVT));

  EXPECT_FALSE(controller_->IsSupported(OpCode::LE_TRACK_ADV));

  EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_DEBUG_INFO));

  EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_A2DP_OPCODE));

  feature_spec_version = 95;
@@ -403,7 +402,6 @@ TEST_F(ControllerTest, feature_spec_version_055_test) { 
TEST_F(ControllerTest, feature_spec_version_095_test) {

  EXPECT_EQ(controller_->GetVendorCapabilities().version_supported_, 95);

  EXPECT_TRUE(controller_->IsSupported(OpCode::LE_MULTI_ADVT));

  EXPECT_TRUE(controller_->IsSupported(OpCode::LE_TRACK_ADV));

  EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_DEBUG_INFO));

  EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_A2DP_OPCODE));

  feature_spec_version = 96;
@@ -412,7 +410,6 @@ TEST_F(ControllerTest, feature_spec_version_095_test) { 
TEST_F(ControllerTest, feature_spec_version_096_test) {

  EXPECT_EQ(controller_->GetVendorCapabilities().version_supported_, 96);

  EXPECT_TRUE(controller_->IsSupported(OpCode::LE_MULTI_ADVT));

  EXPECT_TRUE(controller_->IsSupported(OpCode::LE_TRACK_ADV));

  EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_DEBUG_INFO));

  EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_A2DP_OPCODE));

  feature_spec_version = 98;
@@ -421,7 +418,6 @@ TEST_F(ControllerTest, feature_spec_version_096_test) { 
TEST_F(ControllerTest, feature_spec_version_098_test) {

  EXPECT_EQ(controller_->GetVendorCapabilities().version_supported_, 98);

  EXPECT_TRUE(controller_->IsSupported(OpCode::LE_MULTI_ADVT));

  EXPECT_TRUE(controller_->IsSupported(OpCode::LE_TRACK_ADV));

  EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_DEBUG_INFO));

  EXPECT_TRUE(controller_->IsSupported(OpCode::CONTROLLER_A2DP_OPCODE));

}

system/gd/hci/hci_packets.pdl

+0 −5
Original line number Diff line number Diff line
@@ -350,7 +350,6 @@ enum OpCode : 16 { 
  LE_MULTI_ADVT = 0xFD54,

  LE_BATCH_SCAN = 0xFD56,

  LE_ADV_FILTER = 0xFD57,

  LE_TRACK_ADV = 0xFD58,

  LE_ENERGY_INFO = 0xFD59,

  LE_EXTENDED_SCAN_PARAMS = 0xFD5A,

  CONTROLLER_DEBUG_INFO = 0xFD5B,
@@ -4144,10 +4143,6 @@ packet LeAdvFilterServiceDataComplete : LeAdvFilterComplete (apcf_opcode = SERVI 
}





packet LeTrackAdv : VendorCommand (op_code = LE_TRACK_ADV) {

  _payload_,  // placeholder (unimplemented)

}



packet LeEnergyInfo : VendorCommand (op_code = LE_ENERGY_INFO) {

  _payload_,  // placeholder (unimplemented)

}

system/stack/include/hcidefs.h

+0 −3
Original line number Diff line number Diff line
@@ -438,9 +438,6 @@ 
/* ADV filter opcode */

#define HCI_BLE_ADV_FILTER (0x0157 | HCI_GRP_VENDOR_SPECIFIC)



/* Tracking opcode */

#define HCI_BLE_TRACK_ADV (0x0158 | HCI_GRP_VENDOR_SPECIFIC)



/* Energy info opcode */

#define HCI_BLE_ENERGY_INFO (0x0159 | HCI_GRP_VENDOR_SPECIFIC)