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

Commit de19b57f authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

wifi: Add Implementation of IWifiChip.requestChipDebugInfo am: 4b26c832 

am: 28c1a422

Change-Id: I066124216ed6c2795dbb71897cee542abecd4d68
parents 765f9500 28c1a422

wifi/1.0/default/wifi_chip.cpp

+23 −1
Original line number Diff line number Diff line
@@ -70,7 +70,29 @@ Return<uint32_t> WifiChip::getMode() { 
Return<void> WifiChip::requestChipDebugInfo() {

  if (!legacy_hal_.lock())

    return Void();

  // TODO add implementation



  IWifiChipEventCallback::ChipDebugInfo result;



  std::pair<wifi_error, std::string> ret =

      legacy_hal_.lock()->getWlanDriverVersion();

  if (ret.first != WIFI_SUCCESS) {

    LOG(ERROR) << "Failed to get driver version: "

               << LegacyErrorToString(ret.first);

    return Void();

  }

  result.driverDescription = ret.second.c_str();



  ret = legacy_hal_.lock()->getWlanFirmwareVersion();

  if (ret.first != WIFI_SUCCESS) {

    LOG(ERROR) << "Failed to get firmware version: "

               << LegacyErrorToString(ret.first);

    return Void();

  }

  result.firmwareDescription = ret.second.c_str();



  for (const auto& callback : callbacks_) {

    callback->onChipDebugInfoAvailable(result);

  }

  return Void();

}

wifi/1.0/default/wifi_legacy_hal.cpp

+18 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ namespace wifi { 
namespace V1_0 {

namespace implementation {



const uint32_t WifiLegacyHal::kMaxVersionStringLength = 256;



WifiLegacyHal::WifiLegacyHal()

    : global_handle_(nullptr),

      wlan_interface_handle_(nullptr),
@@ -102,6 +104,22 @@ wifi_error WifiLegacyHal::stop( 
  return WIFI_SUCCESS;

}



std::pair<wifi_error, std::string> WifiLegacyHal::getWlanDriverVersion() {

  std::array<char, kMaxVersionStringLength> buffer;

  buffer.fill(0);

  wifi_error status = global_func_table_.wifi_get_driver_version(

      wlan_interface_handle_, buffer.data(), buffer.size());

  return std::make_pair(status, buffer.data());

}



std::pair<wifi_error, std::string> WifiLegacyHal::getWlanFirmwareVersion() {

  std::array<char, kMaxVersionStringLength> buffer;

  buffer.fill(0);

  wifi_error status = global_func_table_.wifi_get_firmware_version(

      wlan_interface_handle_, buffer.data(), buffer.size());

  return std::make_pair(status, buffer.data());

}



wifi_error WifiLegacyHal::retrieveWlanInterfaceHandle() {

  const std::string& ifname_to_find = getWlanInterfaceName();

wifi/1.0/default/wifi_legacy_hal.h

+5 −0
Original line number Diff line number Diff line
@@ -39,8 +39,13 @@ class WifiLegacyHal { 
  wifi_error start();

  // Deinitialize the legacy HAL and stop the event looper thread.

  wifi_error stop(const std::function<void()>& on_complete_callback);

  // Wrappers for all the functions in the legacy HAL function table.

  std::pair<wifi_error, std::string> getWlanDriverVersion();

  std::pair<wifi_error, std::string> getWlanFirmwareVersion();



 private:

  static const uint32_t kMaxVersionStringLength;



  // Retrieve the interface handle to be used for the "wlan" interface.

  wifi_error retrieveWlanInterfaceHandle();

  // Run the legacy HAL event loop thread.