android: update for broadcom and realtek wireless
This commit is contained in:
August
parent
b43f0ca52a
commit
5c20e85f27
11 changed files with 54 additions and 79 deletions
|
|
@ -14,14 +14,3 @@ TARGET_RECOVERY_FSTAB := device/softwinner/common/recovery.fstab
|
|||
BOARD_SEPOLICY_DIRS += device/softwinner/common/sepolicy/vendor
|
||||
BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/softwinner/common/sepolicy/public
|
||||
BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/softwinner/common/sepolicy/private
|
||||
|
||||
# wifi and bt configuration
|
||||
# 1. Wifi Configuration
|
||||
BOARD_WIFI_VENDOR := common
|
||||
BOARD_WPA_SUPPLICANT_DRIVER := NL80211
|
||||
BOARD_HOSTAPD_DRIVER := NL80211
|
||||
WPA_SUPPLICANT_VERSION := VER_0_8_X
|
||||
BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_common
|
||||
BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_common
|
||||
include hardware/aw/wlan/firmware/firmware.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -15,34 +15,6 @@ service bugreport /system/bin/dumpstate -d -p -B -z \
|
|||
oneshot
|
||||
keycodes 114 115 116
|
||||
|
||||
|
||||
on property:sys.drop_cache=1
|
||||
write /proc/sys/vm/drop_caches 3
|
||||
setprop sys.drop_cache 0
|
||||
|
||||
# broadcom wifi sta p2p concurrent service
|
||||
service wpa_supplicant_broadcom /system/vendor/bin/hw/wpa_supplicant \
|
||||
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
|
||||
-I/vendor/etc/wifi/wpa_supplicant_overlay.conf \
|
||||
-puse_p2p_group_interface=1p2p_device=1use_multi_chan_concurrent=1 \
|
||||
-m/data/misc/wifi/p2p_supplicant.conf \
|
||||
-e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 \
|
||||
-O/data/misc/wifi/sockets \
|
||||
class main
|
||||
socket wpa_wlan0 dgram 660 wifi wifi
|
||||
disabled
|
||||
oneshot
|
||||
|
||||
# realtek & eagle wifi service
|
||||
service wpa_supplicant_realtek /system/vendor/bin/hw/wpa_supplicant \
|
||||
-ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
|
||||
-I/vendor/etc/wifi/p2p_supplicant_overlay.conf \
|
||||
-e/data/misc/wifi/entropy.bin -N \
|
||||
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
|
||||
-I/vendor/etc/wifi/wpa_supplicant_overlay.conf \
|
||||
-O/data/misc/wifi/sockets \
|
||||
-g@android:wpa_wlan0
|
||||
socket wpa_wlan0 dgram 660 wifi wifi
|
||||
class main
|
||||
disabled
|
||||
oneshot
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
on boot
|
||||
#insmod /system/vendor/modules/bcmdhd.ko
|
||||
insmod /system/vendor/modules/bcm_btlpm.ko
|
||||
#insmod /system/vendor/modules/bcm_btlpm.ko
|
||||
|
||||
# Bluetooth
|
||||
# UART device
|
||||
chmod 0660 /dev/ttyS1
|
||||
chown bluetooth net_bt_admin /dev/ttyS1
|
||||
|
||||
# bluetooth power up/down interface
|
||||
chmod 0660 /sys/class/rfkill/rfkill0/state
|
||||
|
|
@ -26,30 +31,31 @@ on boot
|
|||
|
||||
# broadcom wifi service
|
||||
# 1 broadcom wifi sta service
|
||||
# broadcom wifi sta p2p concurrent service
|
||||
service wpa_supplicant_broadcom /system/vendor/bin/hw/wpa_supplicant \
|
||||
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
|
||||
-m/data/misc/wifi/p2p_supplicant.conf \
|
||||
-puse_p2p_group_interface=1p2p_device=1use_multi_chan_concurrent=1 \
|
||||
-O/data/misc/wifi/sockets \
|
||||
-e/data/misc/wifi/entropy.bin \
|
||||
-g@android:wpa_wlan0
|
||||
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
|
||||
-I/vendor/etc/wifi/wpa_supplicant_overlay.conf \
|
||||
-puse_p2p_group_interface=1p2p_device=1use_multi_chan_concurrent=1 \
|
||||
-m/data/misc/wifi/p2p_supplicant.conf \
|
||||
-e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 \
|
||||
-O/data/misc/wifi/sockets \
|
||||
class main
|
||||
socket wpa_wlan0 dgram 660 wifi wifi
|
||||
disabled
|
||||
oneshot
|
||||
|
||||
# 2 broadcom wifi sta p2p concurrent service
|
||||
service p2p_supplicant /system/vendor/bin/wpa_supplicant \
|
||||
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
|
||||
-I/system/etc/wifi/p2p_supplicant_overlay.conf \
|
||||
-puse_p2p_group_interface=1p2p_device=1use_multi_chan_concurrent=1 \
|
||||
-O/data/misc/wifi/sockets \
|
||||
-m/data/misc/wifi/p2p_supplicant.conf \
|
||||
-e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
|
||||
class main
|
||||
socket wpa_wlan0 dgram 660 wifi wifi
|
||||
disabled
|
||||
oneshot
|
||||
#service p2p_supplicant /system/vendor/bin/wpa_supplicant \
|
||||
# -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
|
||||
# -I/system/etc/wifi/p2p_supplicant_overlay.conf \
|
||||
# -puse_p2p_group_interface=1p2p_device=1use_multi_chan_concurrent=1 \
|
||||
# -O/data/misc/wifi/sockets \
|
||||
# -m/data/misc/wifi/p2p_supplicant.conf \
|
||||
# -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
|
||||
# class main
|
||||
# socket wpa_wlan0 dgram 660 wifi wifi
|
||||
# disabled
|
||||
# oneshot
|
||||
|
||||
# Run gps service
|
||||
#service gps-daemon /system/bin/glgps -c /system/etc/gps/gpsconfig.xml
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
on boot
|
||||
insmod /system/vendor/modules/rtl_btlpm.ko
|
||||
|
||||
# Bluetooth
|
||||
# UART device
|
||||
chmod 0660 /dev/rtk_btusb
|
||||
chown bluetooth net_bt_admin /dev/rtk_btusb
|
||||
|
||||
# change back to bluetooth from system
|
||||
chown bluetooth net_bt_admin /data/misc/bluetooth
|
||||
mkdir /data/misc/bluedroid 0770 bluetooth net_bt_admin
|
||||
|
|
@ -23,12 +28,30 @@ on boot
|
|||
chown bluetooth net_bt_admin /data/misc/bluetooth
|
||||
setprop ro.bt.bdaddr_path "/data/misc/bluetooth/bdaddr"
|
||||
|
||||
# MAC Program
|
||||
mkdir /data/misc/bluedroid 0770 bluetooth net_bt_admin
|
||||
exec - root system -- /vendor/xbin/macprog.sh
|
||||
chmod 775 /data/misc/wifi
|
||||
|
||||
# to observe dnsmasq.leases file for dhcp information of soft ap.
|
||||
chown dhcp system /data/misc/dhcp
|
||||
|
||||
# 1. realtek & eagle wifi service
|
||||
service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
|
||||
#service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
|
||||
# -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
|
||||
# -I/vendor/etc/wifi/p2p_supplicant_overlay.conf \
|
||||
# -e/data/misc/wifi/entropy.bin -N \
|
||||
# -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
|
||||
# -I/vendor/etc/wifi/wpa_supplicant_overlay.conf \
|
||||
# -O/data/misc/wifi/sockets \
|
||||
# -g@android:wpa_wlan0
|
||||
# socket wpa_wlan0 dgram 660 wifi wifi
|
||||
# class main
|
||||
# disabled
|
||||
# oneshot
|
||||
|
||||
# realtek & eagle wifi service
|
||||
service wpa_supplicant_realtek /system/vendor/bin/hw/wpa_supplicant \
|
||||
-ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
|
||||
-I/vendor/etc/wifi/p2p_supplicant_overlay.conf \
|
||||
-e/data/misc/wifi/entropy.bin -N \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import /vendor/etc/init/hw/init.common.rc
|
||||
import /vendor/etc/init/hw/init.wireless.rc
|
||||
import /vendor/etc/init/hw/init.device.rc
|
||||
import /vendor/etc/init/hw/init.sun50iw1p1.usb.rc
|
||||
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ ifeq ($(BOARD_WIFI_VENDOR), broadcom)
|
|||
WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path"
|
||||
|
||||
BOARD_USR_WIFI := ap6212
|
||||
include hardware/aw/wlan/config/config.mk
|
||||
include hardware/aw/wlan/firmware/firmware.mk
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
on boot
|
||||
# MAC Program
|
||||
mkdir /data/misc/bluedroid 0770 bluetooth net_bt_admin
|
||||
exec - root system -- /vendor/xbin/macprog.sh
|
||||
chmod 775 /data/misc/wifi
|
||||
|
||||
# Bluetooth
|
||||
# UART device
|
||||
chmod 0660 /dev/ttyS1
|
||||
chown bluetooth net_bt_admin /dev/ttyS1
|
||||
|
||||
|
|
@ -17,9 +17,7 @@
|
|||
########################
|
||||
PRODUCT_COPY_FILES += \
|
||||
hardware/aw/wlan/config/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
|
||||
hardware/aw/wlan/config/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf
|
||||
hardware/aw/wlan/config/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
|
||||
$(TOP_DIR)device/softwinner/common/init.wireless.broadcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.wireless.rc
|
||||
########################
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(TOP_DIR)device/softwinner/common/init.wireless.broadcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wireless.broadcom.rc \
|
||||
$(TOP_DIR)device/softwinner/$(basename $(TARGET_DEVICE))/configs/init.wireless.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wireless.rc
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
include hardware/aw/wlan/config/config.mk
|
||||
include hardware/aw/wlan/firmware/broadcom/ap6212/device-bcm.mk
|
||||
#include hardware/aw/wlan/firmware/broadcom/ap6356s/device-bcm.mk
|
||||
#include hardware/aw/wlan/firmware/broadcom/ap6255/device-bcm.mk
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@ void userial_ioctl_init_bt_wake(int fd)
|
|||
void userial_vendor_init(char *bt_device_node)
|
||||
{
|
||||
vnd_userial.fd = -1;
|
||||
char value[100];
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
snprintf(vnd_userial.port_name, VND_PORT_NAME_MAXLEN, "%s", \
|
||||
bt_device_node);
|
||||
if(rtkbt_transtype & RTKBT_TRANS_H5) {
|
||||
|
|
|
|||
|
|
@ -18,10 +18,7 @@ PRODUCT_COPY_FILES += \
|
|||
hardware/realtek/wlan/config/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
|
||||
hardware/realtek/wlan/config/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
|
||||
hardware/realtek/wlan/config/macprog.sh:$(TARGET_COPY_OUT_VENDOR)/xbin/macprog.sh \
|
||||
device/softwinner/common/init.wireless.realtek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wireless.realtek.rc
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(TOP_DIR)device/softwinner/$(basename $(TARGET_DEVICE))/configs/init.wireless.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wireless.rc
|
||||
device/softwinner/common/init.wireless.realtek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.wireless.rc
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(call find-copy-subdir-files,"wifi_efuse_*.map",$(TOP_DIR)device/softwinner/$(basename $(TARGET_DEVICE))/configs/,$(TARGET_COPY_OUT_VENDOR)/etc/wifi)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue