summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2016-04-14 14:00:59 -0700
committerJohn Stultz <john.stultz@linaro.org>2016-05-10 11:27:41 -0700
commit59e3ba35390632c10709d3d6f25d52acdded7033 (patch)
tree7df486eb7d660a3484778e9d9022254b2187480d
parent68f52278b69d67650ff20d60e9b6d0e7e5099964 (diff)
downloadflo-59e3ba35390632c10709d3d6f25d52acdded7033.tar.gz
Hack and slash wifi support in
Still requires manual tweaking at boot. Needs lots of cleanup Signed-off-by: John Stultz <john.stultz@linaro.org>
-rwxr-xr-xBoardConfigCommon.mk9
-rw-r--r--conn_init/Android.mk4
-rw-r--r--device-common.mk2
-rw-r--r--init.flo.rc43
-rw-r--r--init.flo.wifi.sh2
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml8
-rw-r--r--wpa_supplicant.conf6
7 files changed, 19 insertions, 55 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index fb9cb28..97d9261 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -46,16 +46,11 @@ TARGET_BOARD_PLATFORM := msm8960
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/asus/flo/bluetooth
-# FIXME: HOSTAPD-derived wifi driver
-BOARD_HAS_QCOM_WLAN := true
-BOARD_WLAN_DEVICE := qcwcn
+# generic wifi
WPA_SUPPLICANT_VERSION := VER_0_8_X
BOARD_WPA_SUPPLICANT_DRIVER := NL80211
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
BOARD_HOSTAPD_DRIVER := NL80211
-BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
-WIFI_DRIVER_FW_PATH_STA := "sta"
-WIFI_DRIVER_FW_PATH_AP := "ap"
+CONFIG_DRIVER_NL80211 := y
BOARD_EGL_CFG := device/asus/flo/egl.cfg
diff --git a/conn_init/Android.mk b/conn_init/Android.mk
index 3ef1b80..9536085 100644
--- a/conn_init/Android.mk
+++ b/conn_init/Android.mk
@@ -25,11 +25,11 @@ LOCAL_SRC_FILES := wfc_util_fctrl.c \
LOCAL_CFLAGS := -Wall \
-Werror
LOCAL_CFLAGS += -DCONFIG_LGE_WLAN_WIFI_PATCH
-ifeq ($(BOARD_HAS_QCOM_WLAN), true)
+#ifeq ($(BOARD_HAS_QCOM_WLAN), true)
LOCAL_SRC_FILES += wfc_util_qcom.c
LOCAL_CFLAGS += -DCONFIG_LGE_WLAN_QCOM_PATCH
LOCAL_CFLAGS += -DWLAN_CHIP_VERSION_WCNSS
-endif
+#endif
LOCAL_SHARED_LIBRARIES := libcutils liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := qcom
diff --git a/device-common.mk b/device-common.mk
index a96c951..3bc4e9b 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -50,6 +50,7 @@ PRODUCT_COPY_FILES += \
device/asus/flo/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
device/asus/flo/WCNSS_qcom_wlan_nv_flo.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin \
device/asus/flo/WCNSS_qcom_wlan_nv_deb.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin \
+ device/asus/flo/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
device/asus/flo/init.flo.wifi.sh:system/bin/init.flo.wifi.sh
PRODUCT_COPY_FILES += \
@@ -100,7 +101,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
- frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
diff --git a/init.flo.rc b/init.flo.rc
index 67e2f8e..d45c086 100644
--- a/init.flo.rc
+++ b/init.flo.rc
@@ -335,31 +335,10 @@ service netmgrd /system/bin/netmgrd
service wpa_supplicant /system/bin/wpa_supplicant \
- -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
- -I/system/etc/wifi/wpa_supplicant_overlay.conf \
+ -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf \
-e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
- # we will start as root and wpa_supplicant will switch to user wifi
- # after setting up the capabilities required for WEXT
- # user wifi
- # group wifi inet keystore
- class main
socket wpa_wlan0 dgram 660 wifi wifi
- disabled
- oneshot
-
-service p2p_supplicant /system/bin/wpa_supplicant \
- -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
- -I/system/etc/wifi/p2p_supplicant_overlay.conf -N \
- -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
- -I/system/etc/wifi/wpa_supplicant_overlay.conf \
- -puse_p2p_group_interface=1 \
- -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
-# we will start as root and wpa_supplicant will switch to user wifi
-# after setting up the capabilities required for WEXT
-# user wifi
-# group wifi inet keystore
class main
- socket wpa_wlan0 dgram 660 wifi wifi
disabled
oneshot
@@ -368,16 +347,6 @@ service dhcpcd_wlan0 /system/bin/dhcpcd -aABDKL
disabled
oneshot
-service dhcpcd_eth0 /system/bin/dhcpcd -aABDKL
- class main
- disabled
- oneshot
-
-service dhcpcd_p2p /system/bin/dhcpcd -aABKL
- class main
- disabled
- oneshot
-
service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
class main
disabled
@@ -388,16 +357,6 @@ service iprenew_wlan0 /system/bin/dhcpcd -n
disabled
oneshot
-service iprenew_eth0 /system/bin/dhcpcd -n
- class main
- disabled
- oneshot
-
-service iprenew_p2p /system/bin/dhcpcd -n
- class main
- disabled
- oneshot
-
service iprenew_bt-pan /system/bin/dhcpcd -n
class main
disabled
diff --git a/init.flo.wifi.sh b/init.flo.wifi.sh
index e586e96..14a5394 100644
--- a/init.flo.wifi.sh
+++ b/init.flo.wifi.sh
@@ -7,4 +7,4 @@ rm /data/misc/wifi/WCNSS_qcom_wlan_nv.bin
/system/bin/conn_init
echo 1 > /dev/wcnss_wlan
-
+echo start > /sys/kernel/debug/remoteproc/remoteproc0/state
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 5ce9f27..776fffe 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -128,6 +128,12 @@
<!-- Boolean indicating whether the wifi chipset has background scan support -->
<bool translatable="false" name="config_wifi_background_scan_support">true</bool>
+
+
+ <!-- Integer indicating the framework scan interval in milliseconds. -->
+ <integer translatable="false" name="config_wifi_framework_scan_interval">10000</integer>
+
+
<!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
<bool name="config_intrusiveNotificationLed">true</bool>
@@ -199,8 +205,6 @@
<!-- reference volume index for music stream to limit headphone volume and display warning -->
<integer name="config_safe_media_volume_index">6</integer>
- <bool name="config_enableWifiDisplay">true</bool>
-
<!-- Minimum span needed to begin a touch scaling gesture.
If the span is equal to or greater than this size, a scaling gesture
will begin, where supported. (See android.view.ScaleGestureDetector)
diff --git a/wpa_supplicant.conf b/wpa_supplicant.conf
new file mode 100644
index 0000000..109d46b
--- /dev/null
+++ b/wpa_supplicant.conf
@@ -0,0 +1,6 @@
+##### wpa_supplicant configuration file template #####
+update_config=1
+eapol_version=1
+ap_scan=1
+fast_reauth=1
+disable_scan_offload=1