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

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

Merge "Use proper types gd/hci/[acl|le] managers"

parents 863c1b64 5fe60caa

system/gd/hci/acl_manager/assembler.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct assembler { 
  AclConnection::QueueDownEnd* down_end_;

  os::Handler* handler_;

  PacketViewForRecombination recombination_stage_{PacketView<kLittleEndian>(std::make_shared<std::vector<uint8_t>>())};

  int remaining_sdu_continuation_packet_size_ = 0;

  size_t remaining_sdu_continuation_packet_size_ = 0;

  std::shared_ptr<std::atomic_bool> enqueue_registered_ = std::make_shared<std::atomic_bool>(false);

  std::queue<packet::PacketView<kLittleEndian>> incoming_queue_;

system/gd/hci/le_advertising_manager.cc

+4 −4
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
      case (AdvertisingApiType::EXTENDED): {

        uint16_t data_len = 0;

        // check data size

        for (int i = 0; i < data.size(); i++) {

        for (size_t i = 0; i < data.size(); i++) {

          if (data[i].size() > kLeMaximumFragmentLength) {

            LOG_WARN("AD data len shall not greater than %d", kLeMaximumFragmentLength);

            if (advertising_callbacks_ != nullptr) {
@@ -637,7 +637,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
          uint16_t sub_data_len = 0;

          Operation operation = Operation::FIRST_FRAGMENT;



          for (int i = 0; i < data.size(); i++) {

          for (size_t i = 0; i < data.size(); i++) {

            if (sub_data_len + data[i].size() > kLeMaximumFragmentLength) {

              send_data_fragment(advertiser_id, set_scan_rsp, sub_data, operation);

              operation = Operation::INTERMEDIATE_FRAGMENT;
@@ -750,7 +750,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
  void set_periodic_data(AdvertiserId advertiser_id, std::vector<GapData> data) {

    uint16_t data_len = 0;

    // check data size

    for (int i = 0; i < data.size(); i++) {

    for (size_t i = 0; i < data.size(); i++) {

      if (data[i].size() > kLeMaximumFragmentLength) {

        LOG_WARN("AD data len shall not greater than %d", kLeMaximumFragmentLength);

        if (advertising_callbacks_ != nullptr) {
@@ -779,7 +779,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
      uint16_t sub_data_len = 0;

      Operation operation = Operation::FIRST_FRAGMENT;



      for (int i = 0; i < data.size(); i++) {

      for (size_t i = 0; i < data.size(); i++) {

        if (sub_data_len + data[i].size() > kLeMaximumFragmentLength) {

          send_periodic_data_fragment(advertiser_id, sub_data, operation);

          operation = Operation::INTERMEDIATE_FRAGMENT;