commit acededbcd1c6d08f1bb087da7a074474e9a52dd9
author Roshan Pius <rpius@google.com> Fri Oct 06 14:59:26 2017 -0700
committer Roshan Pius <rpius@google.com> Mon Dec 04 08:14:11 2017 -0800
tree 2ae7ff5c391c9cff3e0cb992b5175b8fbdfc9a42
parent 9377a0d28517bfcaef14f98c249fd1693c75741f

wifi(implementation): Dual interface support

Add support for concurrent interfaces in the WifiLegacyHal class:
a) Removed the hardcoded "wlan0" interface handle in WifiLegacyHal.
b) Modified all the interface specific functions to accept the |iface_name|
argument on which the operation needs to be performed.

Each IWifiIface object will hold the name of the underlying network
interface (wlan0, wlan1 or p2p0) which it is representing.
All IWifiChip operations which needs an iface name will continue to use
the default "wlan0".

Bug: 65671875
Test: Device boots up and connects to wifi networks.
Test: Will send for regression tests.
Change-Id: I9bd9c2a9ba33ac1ea5677fc5d7c261d8eac08e1d

wifi/1.2/default/wifi_rtt_controller.cpp

diff --git a/wifi/1.2/default/wifi_rtt_controller.cpp b/wifi/1.2/default/wifi_rtt_controller.cpp
index 8c3bbe2..8639062 100644
--- a/wifi/1.2/default/wifi_rtt_controller.cpp
+++ b/wifi/1.2/default/wifi_rtt_controller.cpp
@@ -194,7 +194,7 @@
   };
   legacy_hal::wifi_error legacy_status =
       legacy_hal_.lock()->startRttRangeRequest(
-          cmd_id, legacy_configs, on_results_callback);
+          ifname_, cmd_id, legacy_configs, on_results_callback);
   return createWifiStatusFromLegacyError(legacy_status);
 }
 
@@ -205,7 +205,7 @@
     legacy_addrs.push_back(addr);
   }
   legacy_hal::wifi_error legacy_status =
-      legacy_hal_.lock()->cancelRttRangeRequest(cmd_id, legacy_addrs);
+      legacy_hal_.lock()->cancelRttRangeRequest(ifname_, cmd_id, legacy_addrs);
   return createWifiStatusFromLegacyError(legacy_status);
 }
 
@@ -214,7 +214,7 @@
   legacy_hal::wifi_error legacy_status;
   legacy_hal::wifi_rtt_capabilities legacy_caps;
   std::tie(legacy_status, legacy_caps) =
-      legacy_hal_.lock()->getRttCapabilities();
+      legacy_hal_.lock()->getRttCapabilities(ifname_);
   if (legacy_status != legacy_hal::WIFI_SUCCESS) {
     return {createWifiStatusFromLegacyError(legacy_status), {}};
   }
@@ -234,7 +234,7 @@
     return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);
   }
   legacy_hal::wifi_error legacy_status =
-      legacy_hal_.lock()->setRttLci(cmd_id, legacy_lci);
+      legacy_hal_.lock()->setRttLci(ifname_, cmd_id, legacy_lci);
   return createWifiStatusFromLegacyError(legacy_status);
 }
 
@@ -246,7 +246,7 @@
     return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);
   }
   legacy_hal::wifi_error legacy_status =
-      legacy_hal_.lock()->setRttLcr(cmd_id, legacy_lcr);
+      legacy_hal_.lock()->setRttLcr(ifname_, cmd_id, legacy_lcr);
   return createWifiStatusFromLegacyError(legacy_status);
 }
 
@@ -255,7 +255,7 @@
   legacy_hal::wifi_error legacy_status;
   legacy_hal::wifi_rtt_responder legacy_responder;
   std::tie(legacy_status, legacy_responder) =
-      legacy_hal_.lock()->getRttResponderInfo();
+      legacy_hal_.lock()->getRttResponderInfo(ifname_);
   if (legacy_status != legacy_hal::WIFI_SUCCESS) {
     return {createWifiStatusFromLegacyError(legacy_status), {}};
   }
@@ -283,13 +283,14 @@
     return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);
   }
   legacy_hal::wifi_error legacy_status = legacy_hal_.lock()->enableRttResponder(
-      cmd_id, legacy_channel_info, max_duration_seconds, legacy_responder);
+      ifname_, cmd_id, legacy_channel_info, max_duration_seconds,
+      legacy_responder);
   return createWifiStatusFromLegacyError(legacy_status);
 }
 
 WifiStatus WifiRttController::disableResponderInternal(uint32_t cmd_id) {
   legacy_hal::wifi_error legacy_status =
-      legacy_hal_.lock()->disableRttResponder(cmd_id);
+      legacy_hal_.lock()->disableRttResponder(ifname_, cmd_id);
   return createWifiStatusFromLegacyError(legacy_status);
 }
 }  // namespace implementation