diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-07-01 11:03:43 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-07-01 11:03:43 -0700 |
| commit | 4b7ffa08be8d58932841c52ce253ae6ca886a4f2 (patch) | |
| tree | ef2d46b33901c69147b9c3a21871a190ae54fc57 /wifi | |
| parent | d301cb7a5e76f82d265f8a7d408bec3159614f0b (diff) | |
| download | hardware_libhardware_legacy-4b7ffa08be8d58932841c52ce253ae6ca886a4f2.zip hardware_libhardware_legacy-4b7ffa08be8d58932841c52ce253ae6ca886a4f2.tar.gz hardware_libhardware_legacy-4b7ffa08be8d58932841c52ce253ae6ca886a4f2.tar.bz2 | |
wifi: Add wifi_get_fw_path() call
Change-Id: Ib9dc8ce84febb2fba045ee527838653d0d1ad11b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/Android.mk | 9 | ||||
| -rw-r--r-- | wifi/wifi.c | 23 |
2 files changed, 32 insertions, 0 deletions
diff --git a/wifi/Android.mk b/wifi/Android.mk index 70e1b7b..8455d26 100644 --- a/wifi/Android.mk +++ b/wifi/Android.mk @@ -15,6 +15,15 @@ endif ifdef WIFI_FIRMWARE_LOADER LOCAL_CFLAGS += -DWIFI_FIRMWARE_LOADER=\"$(WIFI_FIRMWARE_LOADER)\" endif +ifdef WIFI_DRIVER_FW_PATH_STA +LOCAL_CFLAGS += -DWIFI_DRIVER_FW_PATH_STA=\"$(WIFI_DRIVER_FW_PATH_STA)\" +endif +ifdef WIFI_DRIVER_FW_PATH_AP +LOCAL_CFLAGS += -DWIFI_DRIVER_FW_PATH_AP=\"$(WIFI_DRIVER_FW_PATH_AP)\" +endif +ifdef WIFI_DRIVER_FW_PATH_P2P +LOCAL_CFLAGS += -DWIFI_DRIVER_FW_PATH_P2P=\"$(WIFI_DRIVER_FW_PATH_P2P)\" +endif LOCAL_SRC_FILES += wifi/wifi.c diff --git a/wifi/wifi.c b/wifi/wifi.c index 497d1f7..2591a23 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -57,6 +57,16 @@ static char iface[PROPERTY_VALUE_MAX]; #endif #define WIFI_TEST_INTERFACE "sta" +#ifndef WIFI_DRIVER_FW_PATH_STA +#define WIFI_DRIVER_FW_PATH_STA NULL +#endif +#ifndef WIFI_DRIVER_FW_PATH_AP +#define WIFI_DRIVER_FW_PATH_AP NULL +#endif +#ifndef WIFI_DRIVER_FW_PATH_P2P +#define WIFI_DRIVER_FW_PATH_P2P NULL +#endif + #define WIFI_DRIVER_LOADER_DELAY 1000000 static const char IFACE_DIR[] = "/data/system/wpa_supplicant"; @@ -604,3 +614,16 @@ int wifi_command(const char *command, char *reply, size_t *reply_len) { return wifi_send_command(ctrl_conn, command, reply, reply_len); } + +const char *wifi_get_fw_path(int fw_type) +{ + switch (fw_type) { + case WIFI_GET_FW_PATH_STA: + return WIFI_DRIVER_FW_PATH_STA; + case WIFI_GET_FW_PATH_AP: + return WIFI_DRIVER_FW_PATH_AP; + case WIFI_GET_FW_PATH_P2P: + return WIFI_DRIVER_FW_PATH_P2P; + } + return NULL; +} |