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

Commit c5762c0c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "revert-2258770-revert-2234606-EANUQCVQLE-JKTVHZZJLQ" 

* changes:
  RootCanal: Implement extended advertising PDUs
  Revert^2 "RootCanal: Refactor LE scanning commands"
  Revert^2 "RootCanal: Refactor legacy LE advertising commands"
parents 874bcf0c 55c60321

tools/rootcanal/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ cc_test_host { 
        "rootcanal_defaults",

    ],

    srcs: [

        "test/controller/le/le_set_random_address_test.cc",

        "test/controller/le/le_clear_filter_accept_list_test.cc",

        "test/controller/le/le_add_device_to_filter_accept_list_test.cc",

        "test/controller/le/le_remove_device_from_filter_accept_list_test.cc",
@@ -130,6 +131,16 @@ cc_test_host { 
        "test/controller/le/le_clear_resolving_list_test.cc",

        "test/controller/le/le_remove_device_from_resolving_list_test.cc",

        "test/controller/le/le_set_address_resolution_enable_test.cc",

        "test/controller/le/le_set_advertising_parameters_test.cc",

        "test/controller/le/le_set_advertising_enable_test.cc",

        "test/controller/le/le_set_scan_parameters_test.cc",

        "test/controller/le/le_set_scan_enable_test.cc",

        "test/controller/le/le_set_extended_scan_parameters_test.cc",

        "test/controller/le/le_set_extended_scan_enable_test.cc",

        "test/controller/le/le_set_extended_advertising_parameters_test.cc",

        "test/controller/le/le_set_extended_advertising_data_test.cc",

        "test/controller/le/le_set_extended_scan_response_data_test.cc",

        "test/controller/le/le_set_extended_advertising_enable_test.cc",

    ],

    header_libs: [

        "libbluetooth_headers",

tools/rootcanal/model/controller/controller_properties.cc

+7 −0
Original line number Diff line number Diff line
@@ -308,6 +308,8 @@ ControllerProperties::ControllerProperties(const std::string& file_name) 
            total_num_le_acl_data_packets);

  ParseUint(root, "total_num_iso_data_packets ", total_num_iso_data_packets);

  ParseUint(root, "num_supported_iac", num_supported_iac);

  ParseUint(root, "le_advertising_physical_channel_tx_power",

            le_advertising_physical_channel_tx_power);



  ParseUintArray(root, "lmp_features", lmp_features);

  ParseUintVector(root, "supported_standard_codecs", supported_standard_codecs);
@@ -318,6 +320,11 @@ ControllerProperties::ControllerProperties(const std::string& file_name) 
  ParseUint(root, "le_resolving_list_size", le_resolving_list_size);

  ParseUint(root, "le_supported_states", le_supported_states);



  ParseUint(root, "le_max_advertising_data_length",

            le_max_advertising_data_length);

  ParseUint(root, "le_num_supported_advertising_sets",

            le_num_supported_advertising_sets);



  ParseUintVector(root, "le_vendor_capabilities", le_vendor_capabilities);



  this->hci_version = static_cast<HciVersion>(hci_version);

tools/rootcanal/model/controller/controller_properties.h

+12 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ struct ControllerProperties { 
  // Number of Supported IAC (Vol 4, Part E § 7.3.43).

  uint8_t num_supported_iac{4};



  // LE Advertising Physical Channel TX Power (Vol 4, Part E § 7.8.6).

  uint8_t le_advertising_physical_channel_tx_power{static_cast<uint8_t>(-10)};



  // Supported Codecs (Vol 4, Part E § 7.4.8).

  // Implements the [v1] version only.

  std::vector<uint8_t> supported_standard_codecs{0};
@@ -93,6 +96,15 @@ struct ControllerProperties { 
  // LE Supported States (Vol 4, Part E § 7.8.27).

  uint64_t le_supported_states{0x3ffffffffff};



  // LE Maximum Advertising Data Length (Vol 4, Part E § 7.8.57).

  // Note: valid range 0x001F to 0x0672.

  uint16_t le_max_advertising_data_length{512};



  // LE Number of Supported Advertising Sets (Vol 4, Part E § 7.8.58)

  // Note: the controller can change the number of advertising sets

  // at any time. This behaviour is not emulated here.

  uint8_t le_num_supported_advertising_sets{8};



  // Vendor Information.

  // Provide parameters returned by vendor specific commands.

  std::vector<uint8_t> le_vendor_capabilities{};

tools/rootcanal/model/controller/dual_mode_controller.cc

+81 −143

File changed.

Preview size limit exceeded, changes collapsed.

tools/rootcanal/model/controller/le_advertiser.cc

+1400 −205

File changed.

Preview size limit exceeded, changes collapsed.