Softap: Use wifi_get_fw_path() instead of predefined path

Change-Id: I75d01f2d5a07298e53638aea2431030ca07fd458
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/Android.mk b/Android.mk
index 32830ac..5460ab4 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -27,17 +27,13 @@ LOCAL_C_INCLUDES := $(KERNEL_HEADERS) \
                     $(LOCAL_PATH)/../bluetooth/bluez-clean-headers \
                     external/openssl/include \
                     external/stlport/stlport \
-                    bionic
+                    bionic \
+                    $(call include-path-for, libhardware_legacy)/hardware_legacy
 
 LOCAL_CFLAGS :=
-ifdef WIFI_DRIVER_FW_STA_PATH
-LOCAL_CFLAGS += -DWIFI_DRIVER_FW_STA_PATH=\"$(WIFI_DRIVER_FW_STA_PATH)\"
-endif
-ifdef WIFI_DRIVER_FW_AP_PATH
-LOCAL_CFLAGS += -DWIFI_DRIVER_FW_AP_PATH=\"$(WIFI_DRIVER_FW_AP_PATH)\"
-endif
 
-LOCAL_SHARED_LIBRARIES := libstlport libsysutils libcutils libnetutils libcrypto
+LOCAL_SHARED_LIBRARIES := libstlport libsysutils libcutils libnetutils \
+                          libcrypto libhardware_legacy
 
 ifeq ($(BOARD_HAVE_BLUETOOTH),true)
   LOCAL_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) libbluedroid

diff --git a/SoftapController.cpp b/SoftapController.cpp
index 6039761..aee120f 100644 (file)
--- a/SoftapController.cpp
+++ b/SoftapController.cpp
@@ -35,6 +35,7 @@
 
 #define LOG_TAG "SoftapController"
 #include <cutils/log.h>
+#include "wifi.h"
 
 #include "SoftapController.h"
 
@@ -318,6 +319,7 @@ int SoftapController::fwReloadSoftap(int argc, char *argv[])
 {
     int ret, i = 0;
     char *iface;
+    char *fwpath;
 
     if (mSock < 0) {
         LOGE("Softap fwrealod - failed to open socket");
@@ -331,14 +333,13 @@ int SoftapController::fwReloadSoftap(int argc, char *argv[])
     iface = argv[2];
 
     if (strcmp(argv[3], "AP") == 0) {
-#ifdef WIFI_DRIVER_FW_AP_PATH
-        sprintf(mBuf, "FW_PATH=%s", WIFI_DRIVER_FW_AP_PATH);
-#endif
+        fwpath = (char *)wifi_get_fw_path(WIFI_GET_FW_PATH_AP);
     } else {
-#ifdef WIFI_DRIVER_FW_STA_PATH
-        sprintf(mBuf, "FW_PATH=%s", WIFI_DRIVER_FW_STA_PATH);
-#endif
+        fwpath = (char *)wifi_get_fw_path(WIFI_GET_FW_PATH_STA);
     }
+    if (!fwpath)
+        return -1;
+    sprintf(mBuf, "FW_PATH=%s", fwpath);
     ret = setCommand(iface, "WL_FW_RELOAD");
     if (ret) {
         LOGE("Softap fwReload - failed: %d", ret);