Permalink
Browse files

network: switch to NL80211 and in-build STA/AP/P2P FW

-using I-9100 (GS2) bcmdhd (dhd) module (Update 4)
-reference tuna
-AP: reference isimobile (in-use testing with wext)

Change-Id: I5467ab3e91117802d7c07c548741dcdd5bb15178
  • Loading branch information...
1 parent f350958 commit 2fbe61914f2c27461e823b3a6b3cb0ee23670944 @pershoot pershoot committed with romanbb Mar 22, 2012
Showing with 11 additions and 14 deletions.
  1. +10 −9 BoardConfigCommon.mk
  2. +1 −2 init.p3.rc
  3. +0 −3 p4-common.mk
  4. BIN wifi/bcm4330_aps.bin
View
@@ -71,18 +71,19 @@ BOARD_FLASH_BLOCK_SIZE := 4096
# Wifi related defines
WPA_SUPPLICANT_VERSION := VER_0_8_X
-BOARD_WPA_SUPPLICANT_DRIVER := WEXT
+BOARD_WPA_SUPPLICANT_DRIVER := NL80211
BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
-BOARD_HOSTAP_DRIVER := WEXT
-BOARD_HOSTAP_PRIVATE_LIB := lib_driver_cmd_bcmdhd
+BOARD_HOSTAPD_DRIVER := NL80211
+BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd
BOARD_WLAN_DEVICE := bcmdhd
-WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcmdhd.ko"
-WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path"
-WIFI_DRIVER_FW_PATH_STA := "/system/etc/wifi/bcm4330_sta.bin"
-WIFI_DRIVER_FW_PATH_AP := "/system/etc/wifi/bcm4330_apsta.bin"
-WIFI_DRIVER_MODULE_NAME := "bcmdhd"
-WIFI_DRIVER_MODULE_ARG := "iface_name=eth0 firmware_path=/system/etc/wifi/bcm4330_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
+WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/dhd.ko"
+WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path"
+WIFI_DRIVER_FW_PATH_STA := "/system/vendor/firmware/fw_bcmdhd.bin"
+WIFI_DRIVER_FW_PATH_AP := "/system/vendor/firmware/fw_bcmdhd_apsta.bin"
+WIFI_DRIVER_FW_PATH_P2P := "/system/vendor/firmware/fw_bcmdhd_p2p.bin"
+WIFI_DRIVER_MODULE_NAME := "dhd"
+WIFI_DRIVER_MODULE_ARG := "iface_name=eth0 firmware_path=/system/vendor/firmware/fw_bcmdhd.bin nvram_path=/system/etc/wifi/nvram_net.txt"
BOARD_HAVE_BLUETOOTH := true
BOARD_HAVE_BLUETOOTH_BCM := true
View
@@ -255,7 +255,7 @@ service drm /system/bin/drmserver
user drm
group system root inet sdcard_rw
-service wpa_supplicant /system/bin/wpa_supplicant -Dwext -ieth0 \
+service wpa_supplicant /system/bin/wpa_supplicant -Dnl80211 -ieth0 \
-c/data/misc/wifi/wpa_supplicant.conf -e/data/misc/wifi/entropy.bin
class main
socket wpa_eth0 dgram 0660 wifi wifi
@@ -298,7 +298,6 @@ service gpsd /system/bin/gpsd -c /system/etc/gps.xml
user gps
group system inet
-
# create virtual SD card at /mnt/sdcard, based on the /data/media directory
# daemon will drop to user/group system/media_rw after initializing
# underlying files in /data/media wil be created with user and group media_rw (1023)
View
@@ -64,9 +64,6 @@ PRODUCT_PROPERTY_OVERRIDES := \
wifi.supplicant_scan_interval=90 \
ro.sf.lcd_density=160
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/wifi/bcm4330_aps.bin:system/etc/wifi/bcm4330_apsta.bin
-
BOARD_WLAN_DEVICE_REV := bcm4330_b1
$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk)
View
Binary file not shown.

0 comments on commit 2fbe619

Please sign in to comment.