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

Commit a04ba3fc authored by Roshan Pius's avatar Roshan Pius
Browse files

wifi: Stub implementation of WifiStaIface methods 

Bug: 32221997
Bug: 31991459
Test: Compiles
Change-Id: Iefc68958befc549fd9100b29f84cb6e6d73efe95
parent 7d08d7a1

wifi/1.0/default/wifi_sta_iface.cpp

+222 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ WifiStaIface::WifiStaIface(const std::string& ifname, 


void WifiStaIface::invalidate() {

  legacy_hal_.reset();

  event_callbacks_.clear();

  is_valid_ = false;

}
@@ -54,6 +55,140 @@ Return<void> WifiStaIface::getType(getType_cb hidl_status_cb) { 
                         hidl_status_cb);

}



Return<void> WifiStaIface::registerEventCallback(

    const sp<IWifiStaIfaceEventCallback>& callback,

    registerEventCallback_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::registerEventCallbackInternal,

                         hidl_status_cb,

                         callback);

}



Return<void> WifiStaIface::getCapabilities(getCapabilities_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::getCapabilitiesInternal,

                         hidl_status_cb);

}



Return<void> WifiStaIface::getApfPacketFilterCapabilities(

    getApfPacketFilterCapabilities_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::getApfPacketFilterCapabilitiesInternal,

                         hidl_status_cb);

}



Return<void> WifiStaIface::installApfPacketFilter(

    uint32_t cmd_id,

    const hidl_vec<uint8_t>& program,

    installApfPacketFilter_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::installApfPacketFilterInternal,

                         hidl_status_cb,

                         cmd_id,

                         program);

}



Return<void> WifiStaIface::getBackgroundScanCapabilities(

    getBackgroundScanCapabilities_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::getBackgroundScanCapabilitiesInternal,

                         hidl_status_cb);

}



Return<void> WifiStaIface::getValidFrequenciesForBackgroundScan(

    StaBackgroundScanBand band,

    getValidFrequenciesForBackgroundScan_cb hidl_status_cb) {

  return validateAndCall(

      this,

      WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

      &WifiStaIface::getValidFrequenciesForBackgroundScanInternal,

      hidl_status_cb,

      band);

}



Return<void> WifiStaIface::startBackgroundScan(

    uint32_t cmd_id,

    const StaBackgroundScanParameters& params,

    startBackgroundScan_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::startBackgroundScanInternal,

                         hidl_status_cb,

                         cmd_id,

                         params);

}



Return<void> WifiStaIface::stopBackgroundScan(

    uint32_t cmd_id, stopBackgroundScan_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::stopBackgroundScanInternal,

                         hidl_status_cb,

                         cmd_id);

}



Return<void> WifiStaIface::enableLinkLayerStatsCollection(

    bool debug, enableLinkLayerStatsCollection_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::enableLinkLayerStatsCollectionInternal,

                         hidl_status_cb,

                         debug);

}



Return<void> WifiStaIface::disableLinkLayerStatsCollection(

    disableLinkLayerStatsCollection_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::disableLinkLayerStatsCollectionInternal,

                         hidl_status_cb);

}



Return<void> WifiStaIface::getLinkLayerStats(

    getLinkLayerStats_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::getLinkLayerStatsInternal,

                         hidl_status_cb);

}



Return<void> WifiStaIface::startDebugPacketFateMonitoring(

    startDebugPacketFateMonitoring_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::startDebugPacketFateMonitoringInternal,

                         hidl_status_cb);

}



Return<void> WifiStaIface::stopDebugPacketFateMonitoring(

    stopDebugPacketFateMonitoring_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::stopDebugPacketFateMonitoringInternal,

                         hidl_status_cb);

}



Return<void> WifiStaIface::getDebugTxPacketFates(

    getDebugTxPacketFates_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::getDebugTxPacketFatesInternal,

                         hidl_status_cb);

}



Return<void> WifiStaIface::getDebugRxPacketFates(

    getDebugRxPacketFates_cb hidl_status_cb) {

  return validateAndCall(this,

                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,

                         &WifiStaIface::getDebugRxPacketFatesInternal,

                         hidl_status_cb);

}



std::pair<WifiStatus, std::string> WifiStaIface::getNameInternal() {

  return {createWifiStatus(WifiStatusCode::SUCCESS), ifname_};

}
@@ -62,6 +197,93 @@ std::pair<WifiStatus, IfaceType> WifiStaIface::getTypeInternal() { 
  return {createWifiStatus(WifiStatusCode::SUCCESS), IfaceType::STA};

}



WifiStatus WifiStaIface::registerEventCallbackInternal(

    const sp<IWifiStaIfaceEventCallback>& callback) {

  // TODO(b/31632518): remove the callback when the client is destroyed

  event_callbacks_.emplace_back(callback);

  return createWifiStatus(WifiStatusCode::SUCCESS);

}



std::pair<WifiStatus, uint32_t> WifiStaIface::getCapabilitiesInternal() {

  // TODO implement

  return {createWifiStatus(WifiStatusCode::SUCCESS), 0};

}



std::pair<WifiStatus, StaApfPacketFilterCapabilities>

WifiStaIface::getApfPacketFilterCapabilitiesInternal() {

  // TODO implement

  return {createWifiStatus(WifiStatusCode::SUCCESS), {}};

}



WifiStatus WifiStaIface::installApfPacketFilterInternal(

    uint32_t /* cmd_id */, const std::vector<uint8_t>& /* program */) {

  // TODO implement

  return createWifiStatus(WifiStatusCode::SUCCESS);

}



std::pair<WifiStatus, StaBackgroundScanCapabilities>

WifiStaIface::getBackgroundScanCapabilitiesInternal() {

  // TODO implement

  return {createWifiStatus(WifiStatusCode::SUCCESS), {}};

}



std::pair<WifiStatus, std::vector<WifiChannelInMhz>>

WifiStaIface::getValidFrequenciesForBackgroundScanInternal(

    StaBackgroundScanBand /* band */) {

  // TODO implement

  return {createWifiStatus(WifiStatusCode::SUCCESS), {}};

}



WifiStatus WifiStaIface::startBackgroundScanInternal(

    uint32_t /* cmd_id */, const StaBackgroundScanParameters& /* params */) {

  // TODO implement

  return createWifiStatus(WifiStatusCode::SUCCESS);

}



WifiStatus WifiStaIface::stopBackgroundScanInternal(uint32_t /* cmd_id */) {

  // TODO implement

  return createWifiStatus(WifiStatusCode::SUCCESS);

}



WifiStatus WifiStaIface::enableLinkLayerStatsCollectionInternal(

    bool /* debug */) {

  // TODO implement

  return createWifiStatus(WifiStatusCode::SUCCESS);

}



WifiStatus WifiStaIface::disableLinkLayerStatsCollectionInternal() {

  // TODO implement

  return createWifiStatus(WifiStatusCode::SUCCESS);

}



std::pair<WifiStatus, StaLinkLayerStats>

WifiStaIface::getLinkLayerStatsInternal() {

  // TODO implement

  return {createWifiStatus(WifiStatusCode::SUCCESS), {}};

}



WifiStatus WifiStaIface::startDebugPacketFateMonitoringInternal() {

  // TODO implement

  return createWifiStatus(WifiStatusCode::SUCCESS);

}



WifiStatus WifiStaIface::stopDebugPacketFateMonitoringInternal() {

  // TODO implement

  return createWifiStatus(WifiStatusCode::SUCCESS);

}



std::pair<WifiStatus, std::vector<WifiDebugTxPacketFateReport>>

WifiStaIface::getDebugTxPacketFatesInternal() {

  // TODO implement

  return {createWifiStatus(WifiStatusCode::SUCCESS), {}};

}



std::pair<WifiStatus, std::vector<WifiDebugRxPacketFateReport>>

WifiStaIface::getDebugRxPacketFatesInternal() {

  // TODO implement

  return {createWifiStatus(WifiStatusCode::SUCCESS), {}};

}



}  // namespace implementation

}  // namespace V1_0

}  // namespace wifi

wifi/1.0/default/wifi_sta_iface.h

+59 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <android-base/macros.h>

#include <android/hardware/wifi/1.0/IWifiStaIface.h>

#include <android/hardware/wifi/1.0/IWifiStaIfaceEventCallback.h>



#include "wifi_legacy_hal.h"
@@ -42,14 +43,72 @@ class WifiStaIface : public IWifiStaIface { 
  // HIDL methods exposed.

  Return<void> getName(getName_cb hidl_status_cb) override;

  Return<void> getType(getType_cb hidl_status_cb) override;

  Return<void> registerEventCallback(

      const sp<IWifiStaIfaceEventCallback>& callback,

      registerEventCallback_cb hidl_status_cb) override;

  Return<void> getCapabilities(getCapabilities_cb hidl_status_cb) override;

  Return<void> getApfPacketFilterCapabilities(

      getApfPacketFilterCapabilities_cb hidl_status_cb) override;

  Return<void> installApfPacketFilter(

      uint32_t cmd_id,

      const hidl_vec<uint8_t>& program,

      installApfPacketFilter_cb hidl_status_cb) override;

  Return<void> getBackgroundScanCapabilities(

      getBackgroundScanCapabilities_cb hidl_status_cb) override;

  Return<void> getValidFrequenciesForBackgroundScan(

      StaBackgroundScanBand band,

      getValidFrequenciesForBackgroundScan_cb hidl_status_cb) override;

  Return<void> startBackgroundScan(

      uint32_t cmd_id,

      const StaBackgroundScanParameters& params,

      startBackgroundScan_cb hidl_status_cb) override;

  Return<void> stopBackgroundScan(

      uint32_t cmd_id, stopBackgroundScan_cb hidl_status_cb) override;

  Return<void> enableLinkLayerStatsCollection(

      bool debug, enableLinkLayerStatsCollection_cb hidl_status_cb) override;

  Return<void> disableLinkLayerStatsCollection(

      disableLinkLayerStatsCollection_cb hidl_status_cb) override;

  Return<void> getLinkLayerStats(getLinkLayerStats_cb hidl_status_cb) override;

  Return<void> startDebugPacketFateMonitoring(

      startDebugPacketFateMonitoring_cb hidl_status_cb) override;

  Return<void> stopDebugPacketFateMonitoring(

      stopDebugPacketFateMonitoring_cb hidl_status_cb) override;

  Return<void> getDebugTxPacketFates(

      getDebugTxPacketFates_cb hidl_status_cb) override;

  Return<void> getDebugRxPacketFates(

      getDebugRxPacketFates_cb hidl_status_cb) override;



 private:

  // Corresponding worker functions for the HIDL methods.

  std::pair<WifiStatus, std::string> getNameInternal();

  std::pair<WifiStatus, IfaceType> getTypeInternal();

  WifiStatus registerEventCallbackInternal(

      const sp<IWifiStaIfaceEventCallback>& callback);

  std::pair<WifiStatus, uint32_t> getCapabilitiesInternal();

  std::pair<WifiStatus, StaApfPacketFilterCapabilities>

  getApfPacketFilterCapabilitiesInternal();

  WifiStatus installApfPacketFilterInternal(

      uint32_t cmd_id, const std::vector<uint8_t>& program);

  std::pair<WifiStatus, StaBackgroundScanCapabilities>

  getBackgroundScanCapabilitiesInternal();

  std::pair<WifiStatus, std::vector<WifiChannelInMhz>>

  getValidFrequenciesForBackgroundScanInternal(StaBackgroundScanBand band);

  WifiStatus startBackgroundScanInternal(

      uint32_t cmd_id, const StaBackgroundScanParameters& params);

  WifiStatus stopBackgroundScanInternal(uint32_t cmd_id);

  WifiStatus enableLinkLayerStatsCollectionInternal(bool debug);

  WifiStatus disableLinkLayerStatsCollectionInternal();

  std::pair<WifiStatus, StaLinkLayerStats> getLinkLayerStatsInternal();

  WifiStatus startDebugPacketFateMonitoringInternal();

  WifiStatus stopDebugPacketFateMonitoringInternal();

  std::pair<WifiStatus, std::vector<WifiDebugTxPacketFateReport>>

  getDebugTxPacketFatesInternal();

  std::pair<WifiStatus, std::vector<WifiDebugRxPacketFateReport>>

  getDebugRxPacketFatesInternal();



  std::string ifname_;

  std::weak_ptr<WifiLegacyHal> legacy_hal_;

  std::vector<sp<IWifiStaIfaceEventCallback>> event_callbacks_;

  bool is_valid_;



  DISALLOW_COPY_AND_ASSIGN(WifiStaIface);