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

Commit 645929a6 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Plumb advertiser data through shim controller" am: bfaa9188 am: 49b02d54 am: 10ce0c12 

Change-Id: I72d06a9625adc6e9794b20e7b1b75628baf759fe
parents abba89dc 10ce0c12

system/gd/shim/controller.cc

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ uint64_t Controller::GetControllerLeSupportedStates() const { 
  return pimpl_->hci_controller_->GetControllerLeSupportedStates();

}



uint8_t Controller::GetControllerLeNumberOfSupportedAdverisingSets() const {

  return pimpl_->hci_controller_->GetControllerLeNumberOfSupportedAdverisingSets();

}



uint8_t Controller::GetControllerLocalExtendedFeaturesMaxPageNumber() const {

  return pimpl_->hci_controller_->GetControllerLocalExtendedFeaturesMaxPageNumber();

}

system/gd/shim/controller.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ class Controller : public bluetooth::Module, public bluetooth::shim::IController 
  uint64_t GetControllerLeLocalSupportedFeatures() const override;

  uint64_t GetControllerLeSupportedStates() const override;

  uint64_t GetControllerLocalExtendedFeatures(uint8_t page_number) const override;

  uint8_t GetControllerLeNumberOfSupportedAdverisingSets() const override;

  uint8_t GetControllerLocalExtendedFeaturesMaxPageNumber() const override;



 protected:

system/gd/shim/icontroller.h

+1 −1
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ struct IController { 
  virtual uint64_t GetControllerLeLocalSupportedFeatures() const = 0;

  virtual uint64_t GetControllerLeSupportedStates() const = 0;

  virtual uint64_t GetControllerLocalExtendedFeatures(uint8_t page_number) const = 0;

  virtual uint8_t GetControllerLeNumberOfSupportedAdverisingSets() const = 0;

  virtual uint8_t GetControllerLocalExtendedFeaturesMaxPageNumber() const = 0;



  virtual ~IController() {}

};