Wifi-HAL: RTT API Enhancement

RTT API's are modified to allow responder to indicate the RTT
preamble which can be advertised in BLE Beacon. So, modify
RTT HAL to comply with new API.

BUG: 28071418

Change-Id: I04062e9c603c0f00cc90880f0d6a040b1fe8abe5

3 files changed, 23 insertions, 22 deletions

diff --git a/qcwcn/wifi_hal/rtt.cpp b/qcwcn/wifi_hal/rtt.cpp
index 9b4a369..d929c3a 100644
--- a/qcwcn/wifi_hal/rtt.cpp
+++ b/qcwcn/wifi_hal/rtt.cpp
@@ -301,17 +301,18 @@ cleanup:
     return (wifi_error)ret;
 }
 
-/**
- * Get available WiFi channel to enable RTT responder on.
+/*
+ * Get RTT responder information e.g. WiFi channel to enable responder on.
  */
-wifi_error wifi_rtt_get_available_channel(wifi_interface_handle iface,
-                                           wifi_channel_info* channel)
+wifi_error wifi_rtt_get_responder_info(wifi_interface_handle iface,
+                                      wifi_rtt_responder *responder_info)
 {
     int ret = WIFI_SUCCESS;
     lowi_cb_table_t *lowiWifiHalApi = NULL;
 
-    if (iface == NULL || channel == NULL) {
-        ALOGE("%s: iface : %p channel : %p", __FUNCTION__, iface, channel);
+    if (iface == NULL || responder_info == NULL) {
+        ALOGE("%s: iface : %p responder_info : %p", __FUNCTION__, iface,
+               responder_info);
         return WIFI_ERROR_INVALID_ARGS;
     }
 
@@ -319,14 +320,14 @@ wifi_error wifi_rtt_get_available_channel(wifi_interface_handle iface,
     lowiWifiHalApi = getLowiCallbackTable(
                     ONE_SIDED_RANGING_SUPPORTED|DUAL_SIDED_RANGING_SUPPORED);
     if (lowiWifiHalApi == NULL ||
-        lowiWifiHalApi->rtt_get_available_channnel == NULL) {
+        lowiWifiHalApi->rtt_get_responder_info == NULL) {
         ALOGE("%s: getLowiCallbackTable returned NULL or "
             "the function pointer is NULL. Exit.", __FUNCTION__);
         ret = WIFI_ERROR_NOT_SUPPORTED;
         goto cleanup;
     }
 
-    ret = lowiWifiHalApi->rtt_get_available_channnel(iface, channel);
+    ret = lowiWifiHalApi->rtt_get_responder_info(iface, responder_info);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: returned error:%d. Exit.",
               __FUNCTION__, ret);
@@ -342,20 +343,20 @@ cleanup:
  * channel_hint - hint of the channel information where RTT responder should
  *                be enabled on.
  * max_duration_seconds - timeout of responder mode.
- * channel_used - channel used for RTT responder, NULL if responder is not
- *                enabled.
+ * responder_info - responder information e.g. channel used for RTT responder,
+ *                  NULL if responder is not enabled.
  */
 wifi_error wifi_enable_responder(wifi_request_id id,
                                  wifi_interface_handle iface,
                                  wifi_channel_info channel_hint,
                                  unsigned max_duration_seconds,
-                                 wifi_channel_info* channel_used)
+                                 wifi_rtt_responder *responder_info)
 {
     int ret = WIFI_SUCCESS;
     lowi_cb_table_t *lowiWifiHalApi = NULL;
 
-    if (iface == NULL || channel_used == NULL) {
-        ALOGE("%s: iface : %p channel : %p", __FUNCTION__, iface, channel_used);
+    if (iface == NULL || responder_info == NULL) {
+        ALOGE("%s: iface : %p responder_info : %p", __FUNCTION__, iface, responder_info);
         return WIFI_ERROR_INVALID_ARGS;
     }
 
@@ -372,7 +373,7 @@ wifi_error wifi_enable_responder(wifi_request_id id,
 
     ret = lowiWifiHalApi->enable_responder(id, iface, channel_hint,
                                            max_duration_seconds,
-                                           channel_used);
+                                           responder_info);
     if (ret != WIFI_SUCCESS) {
         ALOGE("%s: returned error:%d. Exit.",
               __FUNCTION__, ret);
diff --git a/qcwcn/wifi_hal/wifi_hal.cpp b/qcwcn/wifi_hal/wifi_hal.cpp
index 3727e0b..27f297f 100644
--- a/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/qcwcn/wifi_hal/wifi_hal.cpp
@@ -307,7 +307,7 @@ wifi_error init_wifi_vendor_hal_func_table(wifi_hal_fn *fn) {
     fn->wifi_rtt_range_request = wifi_rtt_range_request;
     fn->wifi_rtt_range_cancel = wifi_rtt_range_cancel;
     fn->wifi_get_rtt_capabilities = wifi_get_rtt_capabilities;
-    fn->wifi_rtt_get_available_channel = wifi_rtt_get_available_channel;
+    fn->wifi_rtt_get_responder_info = wifi_rtt_get_responder_info;
     fn->wifi_enable_responder = wifi_enable_responder;
     fn->wifi_disable_responder = wifi_disable_responder;
     fn->wifi_set_nodfs_flag = wifi_set_nodfs_flag;
diff --git a/qcwcn/wifi_hal/wifihal_internal.h b/qcwcn/wifi_hal/wifihal_internal.h
index 8c58f63..986b151 100755
--- a/qcwcn/wifi_hal/wifihal_internal.h
+++ b/qcwcn/wifi_hal/wifihal_internal.h
@@ -38,7 +38,7 @@
 
 #define WIFIHAL_LOWI_MAJOR_VERSION      2
 #define WIFIHAL_LOWI_MINOR_VERSION      1
-#define WIFIHAL_LOWI_MICRO_VERSION      0
+#define WIFIHAL_LOWI_MICRO_VERSION      1
 
 /* LOWI supported capabilities bit masks */
 #define ONE_SIDED_RANGING_SUPPORTED   0x00000001
@@ -129,24 +129,24 @@ typedef struct
                             wifi_lcr_information *lcr);
 
   /**
-   * Get available WiFi channel to enable RTT responder on.
+   * Get RTT responder information e.g. WiFi channel to enable responder on.
    */
-  wifi_error (*rtt_get_available_channnel)(wifi_interface_handle iface,
-                                           wifi_channel_info* channel);
+  wifi_error (*rtt_get_responder_info)(wifi_interface_handle iface,
+                                       wifi_rtt_responder *responder_info);
 
   /**
    * Enable RTT responder mode.
    * channel_hint - hint of the channel information where RTT responder should
    *                be enabled on.
    * max_duration_seconds - timeout of responder mode.
-   * channel_used - channel used for RTT responder, NULL if responder is not
-   *                enabled.
+   * responder_info - responder information e.g. channel used for RTT responder,
+   *                  NULL if responder is not enabled.
    */
   wifi_error (*enable_responder)(wifi_request_id id,
                                  wifi_interface_handle iface,
                                  wifi_channel_info channel_hint,
                                  unsigned max_duration_seconds,
-                                 wifi_channel_info* channel_used);
+                                 wifi_rtt_responder *responder_info);
 
   /**
    * Disable RTT responder mode.