diff options
| author | Michaël Burtin <bukington@gmail.com> | 2011-11-27 15:41:34 +0100 |
|---|---|---|
| committer | Michaël Burtin <bukington@gmail.com> | 2011-12-05 22:26:43 +0100 |
| commit | b73f4263bf277d6fa3ea2a59a87a4d7e104542d5 (patch) | |
| tree | 659c7fa90071cb2498cc43b712f36b5b0ac21226 | |
| parent | b5b42e3aed2255bd04edd876b5e66d81c2924450 (diff) | |
| download | android_hardware_libhardware_legacy-gingerbread.tar.gz android_hardware_libhardware_legacy-gingerbread.tar.bz2 android_hardware_libhardware_legacy-gingerbread.zip | |
wifi: move AP driver configuration in board flagsgingerbreadgb-release-7.2
Add board flags WIFI_AP_DRIVER_MODULE_PATH, WIFI_AP_DRIVER_MODULE_ARG,
WIFI_AP_DRIVER_MODULE_NAME and WIFI_AP_FIRMWARE_LOADER to allow AP firmware
customization at device level.
Change-Id: Ia80921e14dc101b3977aa6e37a8a41231e9aa29a
| -rw-r--r-- | wifi/Android.mk | 12 | ||||
| -rw-r--r-- | wifi/wifi.c | 28 |
2 files changed, 32 insertions, 8 deletions
diff --git a/wifi/Android.mk b/wifi/Android.mk index 2ea3d8d..684047b 100644 --- a/wifi/Android.mk +++ b/wifi/Android.mk @@ -24,6 +24,18 @@ endif ifdef WIFI_PRE_LOADER LOCAL_CFLAGS += -DWIFI_PRE_LOADER=\"$(WIFI_PRE_LOADER)\" endif +ifdef WIFI_AP_DRIVER_MODULE_PATH +LOCAL_CFLAGS += -DWIFI_AP_DRIVER_MODULE_PATH=\"$(WIFI_AP_DRIVER_MODULE_PATH)\" +endif +ifdef WIFI_AP_DRIVER_MODULE_ARG +LOCAL_CFLAGS += -DWIFI_AP_DRIVER_MODULE_ARG=\"$(WIFI_AP_DRIVER_MODULE_ARG)\" +endif +ifdef WIFI_AP_DRIVER_MODULE_NAME +LOCAL_CFLAGS += -DWIFI_AP_DRIVER_MODULE_NAME=\"$(WIFI_AP_DRIVER_MODULE_NAME)\" +endif +ifdef WIFI_AP_FIRMWARE_LOADER +LOCAL_CFLAGS += -DWIFI_AP_FIRMWARE_LOADER=\"$(WIFI_AP_FIRMWARE_LOADER)\" +endif LOCAL_SRC_FILES += wifi/wifi.c diff --git a/wifi/wifi.c b/wifi/wifi.c index 898a0c5..167402b 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -59,12 +59,24 @@ static char iface[PROPERTY_VALUE_MAX]; #define WIFI_DRIVER_MODULE_ARG "" #endif #ifndef WIFI_FIRMWARE_LOADER -#define WIFI_FIRMWARE_LOADER "" +#define WIFI_FIRMWARE_LOADER "" #endif #ifndef WIFI_PRE_LOADER -#define WIFI_PRE_LOADER "" +#define WIFI_PRE_LOADER "" #endif -#define WIFI_TEST_INTERFACE "sta" +#ifndef WIFI_AP_DRIVER_MODULE_NAME +#define WIFI_AP_DRIVER_MODULE_NAME "tiap_drv" +#endif +#ifndef WIFI_AP_DRIVER_MODULE_PATH +#define WIFI_AP_DRIVER_MODULE_PATH "/system/lib/modules/tiap_drv.ko" +#endif +#ifndef WIFI_AP_DRIVER_MODULE_ARG +#define WIFI_AP_DRIVER_MODULE_ARG "" +#endif +#ifndef WIFI_AP_FIRMWARE_LOADER +#define WIFI_AP_FIRMWARE_LOADER "wlan_ap_loader" +#endif +#define WIFI_TEST_INTERFACE "sta" #define WIFI_DRIVER_LOADER_DELAY 1000000 @@ -82,11 +94,11 @@ static const char SUPP_CONFIG_FILE[] = "/data/misc/wifi/wpa_supplicant.conf"; static const char MODULE_FILE[] = "/proc/modules"; static const char PRELOADER[] = WIFI_PRE_LOADER; -static const char AP_DRIVER_MODULE_NAME[] = "tiap_drv"; -static const char AP_DRIVER_MODULE_TAG[] = "tiap_drv" " "; -static const char AP_DRIVER_MODULE_PATH[] = "/system/lib/modules/tiap_drv.ko"; -static const char AP_DRIVER_MODULE_ARG[] = ""; -static const char AP_FIRMWARE_LOADER[] = "wlan_ap_loader"; +static const char AP_DRIVER_MODULE_NAME[] = WIFI_AP_DRIVER_MODULE_NAME; +static const char AP_DRIVER_MODULE_TAG[] = WIFI_AP_DRIVER_MODULE_NAME " "; +static const char AP_DRIVER_MODULE_PATH[] = WIFI_AP_DRIVER_MODULE_PATH; +static const char AP_DRIVER_MODULE_ARG[] = WIFI_AP_DRIVER_MODULE_ARG; +static const char AP_FIRMWARE_LOADER[] = WIFI_AP_FIRMWARE_LOADER; static const char AP_DRIVER_PROP_NAME[] = "wlan.ap.driver.status"; #ifdef WIFI_EXT_MODULE_NAME |