diff options
| -rw-r--r-- | BoardConfigCommon.mk | 21 | ||||
| -rw-r--r-- | device_base.mk | 5 | ||||
| -rw-r--r-- | init.aries.rc | 29 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 7 |
4 files changed, 47 insertions, 15 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 807438e..ff84666 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -70,15 +70,18 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 2013265920 BOARD_FLASH_BLOCK_SIZE := 4096 # Connectivity - Wi-Fi -BOARD_WPA_SUPPLICANT_DRIVER := WEXT -WPA_SUPPLICANT_VERSION := VER_0_8_X -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_wext -BOARD_WLAN_DEVICE := bcm4329 -WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcm4329.ko" -WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcm4329.bin" -WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcm4329_apsta.bin" -WIFI_DRIVER_MODULE_NAME := "bcm4329" -WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/vendor/firmware/nvram_net.txt" +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +WPA_SUPPLICANT_VERSION := VER_0_8_X +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd +BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd +BOARD_WLAN_DEVICE := bcmdhd +BOARD_WLAN_DEVICE_REV := bcm4329 +WIFI_DRIVER_MODULE_NAME := "bcmdhd" +WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" +WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" +WIFI_DRIVER_FW_PATH_P2P := "/vendor/firmware/fw_bcmdhd_p2p.bin" +WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin" # Vold BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true diff --git a/device_base.mk b/device_base.mk index 79f38d3..541e6b6 100644 --- a/device_base.mk +++ b/device_base.mk @@ -120,6 +120,7 @@ PRODUCT_COPY_FILES += \ frameworks/base/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \ frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ + frameworks/base/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \ frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ frameworks/base/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \ frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ @@ -135,7 +136,7 @@ PRODUCT_PROPERTY_OVERRIDES := \ # Note that the only such settings should be the ones that are too low-level to # be reachable from resources or other mechanisms. PRODUCT_PROPERTY_OVERRIDES += \ - wifi.interface=eth0 \ + wifi.interface=wlan0 \ wifi.supplicant_scan_interval=20 \ ro.telephony.ril_class=samsung \ ro.telephony.ril.v3=icccardstatus,datacall,signalstrength,facilitylock \ @@ -165,3 +166,5 @@ PRODUCT_TAGS += dalvik.gc.type-precise PRODUCT_COPY_FILES += \ device/samsung/aries-common/updater.sh:updater.sh + +$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/device-bcm.mk)
\ No newline at end of file diff --git a/init.aries.rc b/init.aries.rc index 650a63a..5d99a99 100644 --- a/init.aries.rc +++ b/init.aries.rc @@ -126,18 +126,39 @@ service gpsd /system/vendor/bin/gpsd -c /vendor/etc/gps.xml user gps group system inet -service wpa_supplicant /system/bin/wpa_supplicant -Dwext -ieth0 -c/data/misc/wifi/wpa_supplicant.conf +service wpa_supplicant /system/bin/wpa_supplicant \ + -Dnl80211 -iwlan0 -puse_p2p_group_interface=1 -e/data/misc/wifi/entropy.bin class main - socket wpa_eth0 dgram 0660 wifi wifi + socket wpa_wlan0 dgram 0660 wifi wifi disabled oneshot -service dhcpcd_eth0 /system/bin/dhcpcd -ABKL +service dhcpcd_wlan0 /system/bin/dhcpcd -ABKL class main disabled oneshot -service iprenew_eth0 /system/bin/dhcpcd -n +service dhcpcd_p2p /system/bin/dhcpcd -aABKL + class main + disabled + oneshot + +service dhcpcd_bnep0 /system/bin/dhcpcd -ABKL + class main + disabled + oneshot + +service iprenew_wlan0 /system/bin/dhcpcd -n + class main + disabled + oneshot + +service iprenew_p2p /system/bin/dhcpcd -n + class main + disabled + oneshot + +service iprenew_bnep0 /system/bin/dhcpcd -n class main disabled oneshot diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 3ea7f48..20401eb 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -138,6 +138,8 @@ <item>"mobile_supl,3,0,2,60000,true"</item> <item>"mobile_dun,4,0,4,60000,true"</item> <item>"mobile_hipri,5,0,3,60000,true"</item> + <item>"mobile_bluetooth,7,7,1,-1,true"</item> + <item>"wifi_p2p,13,1,0,-1,true"</item> </string-array> <!-- List of regexpressions describing the interface (if any) that represent tetherable @@ -151,7 +153,7 @@ Wifi interfaces. If the device doesn't want to support tethering over Wifi this should be empty. An example would be "softap.*" --> <string-array translatable="false" name="config_tether_wifi_regexs"> - <item>"wl0.1"</item> + <item>"wlan0"</item> </string-array> <!-- List of regexpressions describing the interface (if any) that represent tetherable @@ -169,6 +171,9 @@ <item>1</item> </integer-array> + <!-- Boolean indicating whether the wifi chipset has p2p support --> + <bool translatable="false" name="config_wifi_p2p_support">true</bool> + <!-- Vibrator pattern for a very short but reliable vibration for soft keyboard tap --> <integer-array name="config_keyboardTapVibePattern"> <item>30</item> |