diff options
| -rw-r--r-- | BoardConfigCommon.mk | 19 | ||||
| -rw-r--r-- | bluetooth/vnd_shinano.txt | 13 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 14 | ||||
| -rw-r--r-- | rootdir/init.qcom.rc | 109 | ||||
| -rw-r--r-- | rootdir/system/etc/firmware/wlan/prima/WCNSS_cfg.dat | bin | 10746 -> 0 bytes | |||
| -rw-r--r-- | rootdir/system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini | 371 | ||||
| -rw-r--r-- | rootdir/system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin | bin | 29816 -> 0 bytes | |||
| -rw-r--r-- | rootdir/system/etc/init.qcom.wifi.sh | 16 | ||||
| -rw-r--r-- | shinano.mk | 18 |
9 files changed, 93 insertions, 467 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index d734bb5..e68d682 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -63,8 +63,8 @@ AUDIO_FEATURE_DISABLED_USBAUDIO := true # Bluetooth BOARD_HAVE_BLUETOOTH := true -BOARD_HAVE_BLUETOOTH_QCOM := true -BLUETOOTH_HCI_USE_MCT := true +BOARD_HAVE_BLUETOOTH_BCM := true +BOARD_BLUEDROID_VENDOR_CONF := device/sony/shinano-common/bluetooth/vnd_shinano.txt # Camera COMMON_GLOBAL_CFLAGS += -DNEEDS_VECTORIMPL_SYMBOLS @@ -111,19 +111,18 @@ BOARD_SEPOLICY_UNION := \ file_contexts # Wifi -BOARD_HAS_QCOM_WLAN := true -BOARD_WLAN_DEVICE := qcwcn WPA_SUPPLICANT_VERSION := VER_0_8_X +BOARD_WLAN_DEVICE := bcmdhd 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_MODULE_PATH := "/system/lib/modules/wlan.ko" -WIFI_DRIVER_MODULE_NAME := "wlan" -WIFI_DRIVER_FW_PATH_STA := "sta" -WIFI_DRIVER_FW_PATH_AP := "ap" - -BOARD_USE_SONY_MACUPDATE := true +WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcmdhd.ko" +WIFI_DRIVER_MODULE_NAME := "bcmdhd" +WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/wlan/parameters/firmware_path" +WIFI_DRIVER_FW_PATH_AP := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd_apsta.bin" +WIFI_DRIVER_FW_PATH_STA := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd.bin" +WIFI_DRIVER_MODULE_ARG := "nvram_path=/system/etc/firmware/wlan/bcmdhd/bcmdhd.cal" # Filesystem BOARD_FLASH_BLOCK_SIZE := 131072 diff --git a/bluetooth/vnd_shinano.txt b/bluetooth/vnd_shinano.txt new file mode 100644 index 0000000..ddc48ca --- /dev/null +++ b/bluetooth/vnd_shinano.txt @@ -0,0 +1,13 @@ +BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS0" +FW_PATCHFILE_LOCATION = "/system/etc/firmware/" +BT_WAKE_VIA_PROC = TRUE +LPM_IDLE_TIMEOUT_MULTIPLE = 5 +BTVND_DBG = FALSE +BTHW_DBG = FALSE +VNDUSERIAL_DBG = FALSE +UPIO_DBG = FALSE +UART_TARGET_BAUD_RATE = 3000000 +FW_PATCH_SETTLEMENT_DELAY_MS = 100 +USE_AXI_BRIDGE_LOCK = TRUE +UART_FORCE_TWO_STOPBITS = TRUE +LPM_COMBINE_SLEEP_MODE_AND_LPM = 0 diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index c4a60d7..3d0530e 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -97,13 +97,20 @@ <item>0</item> </integer-array> + <!-- List of regexpressions describing the interface (if any) that represent tetherable + USB interfaces. If the device doesn't want to support tething over USB this should + be empty. An example would be "usb.*" --> <string-array translatable="false" name="config_tether_usb_regexs"> - <item>"usb\\d"</item> - <item>"rndis\\d"</item> + <item>"usb\\d"</item> + <item>"rndis\\d"</item> </string-array> + <!-- List of regexpressions describing the interface (if any) that represent tetherable + 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>"wlan0"</item> + <item>"softap.*"</item> </string-array> <!-- List of regexpressions describing the interface (if any) that represent tetherable @@ -129,6 +136,9 @@ <!-- Boolean indicating whether the wifi chipset has dual frequency band support --> <bool translatable="false" name="config_wifi_dual_band_support">true</bool> + <!-- Wifi driver supports batched scan --> + <bool translatable="false" name="config_wifi_batched_scan_supported">true</bool> + <!-- reference volume index for music stream to limit headphone volume and display warning --> <integer name="config_safe_media_volume_index">7</integer> diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 44b34f5..27067c7 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -53,6 +53,20 @@ on init mkdir /dev/bus 0755 root root mkdir /dev/bus/usb 0755 root root + # Bluetooth address setting + setprop ro.bt.bdaddr_path "/data/etc/bluetooth_bdaddr" + chown bluetooth bluetooth ro.bt.bdaddr_path + + # Enable Bluetooth HFP 1.6 + setprop ro.bluetooth.hfp.ver 1.6 + + # Disable Bluetooth A2DP SNK + setprop bluetooth.a2dp.sink.enabled false + + # Enable Bluetooth WakeUp trigger + chown bluetooth net_bt_admin /proc/bluetooth/wakeup/proto + chmod 0660 /proc/bluetooth/wakeup/proto + # create directory for scd mkdir /dev/socket/scd 0755 system system @@ -109,33 +123,17 @@ on early-boot # Run pre_hw_config.sh before entering charge only mode. exec /system/bin/sh /system/etc/pre_hw_config.sh - exec /system/bin/sh /system/etc/init.qcom.wifi.sh - on boot write /sys/module/qpnp_power_on/parameters/forcecrash_on 1 exec /system/bin/btnvtool -O - chown bluetooth bluetooth /sys/module/bluetooth_power/parameters/power - chown bluetooth bluetooth /sys/class/rfkill/rfkill0/type - chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state - chown bluetooth bluetooth /proc/bluetooth/sleep/proto - chown bluetooth bluetooth /sys/module/hci_uart/parameters/ath_lpm - chown bluetooth bluetooth /sys/module/hci_uart/parameters/ath_btwrite - chown system system /sys/module/sco/parameters/disable_esco - chown bluetooth bluetooth /sys/module/hci_smd/parameters/hcismd_set - chmod 0660 /sys/module/bluetooth_power/parameters/power - chmod 0660 /sys/module/hci_smd/parameters/hcismd_set + chown bluetooth net_bt_admin /sys/class/rfkill/rfkill0/type + chown bluetooth net_bt_admin /sys/class/rfkill/rfkill0/state chmod 0660 /sys/class/rfkill/rfkill0/state - chmod 0660 /proc/bluetooth/sleep/proto - chown bluetooth bluetooth /dev/ttyHS0 - chmod 0660 /sys/module/hci_uart/parameters/ath_lpm - chmod 0660 /sys/module/hci_uart/parameters/ath_btwrite + chown bluetooth net_bt_admin /dev/ttyHS0 chmod 0660 /dev/ttyHS0 chown bluetooth bluetooth /sys/devices/platform/msm_serial_hs.0/clock chmod 0660 /sys/devices/platform/msm_serial_hs.0/clock - chmod 0660 /dev/ttyHS2 - chown bluetooth bluetooth /dev/ttyHS2 - # Create QMUX deamon socket area mkdir /dev/socket/qmux_radio 0770 radio radio chmod 2770 /dev/socket/qmux_radio @@ -260,7 +258,6 @@ on post-fs # Change to socket location on libkeyctrl/suntory for /data encryption mkdir /dev/socket/suntory 0755 system system -# msm specific files that need to be created on /data on post-fs-data mkdir /data/media 0770 media_rw media_rw @@ -512,25 +509,6 @@ on charger on property:init.svc.wpa_supplicant=stopped stop dhcpcd -# Update WIFI MAC address -service mac-update /system/bin/mac-update - class main - user wifi - oneshot - -service hciattach /system/bin/sh /system/etc/init.qcom.bt.sh - class late_start - user bluetooth - group qcom_oncrpc bluetooth net_bt_admin system net_bt_stack - disabled - oneshot - -on property:bluetooth.hciattach=true - start hciattach - -on property:bluetooth.hciattach=false - setprop bluetooth.status off - # QMUX must be in multiple groups to support external process connections service qmuxd /system/bin/qmuxd class main @@ -579,13 +557,16 @@ on property:sys.boot_completed=1 service qseecomd /system/bin/qseecomd class core user root - group root + group root persist_rw -service wpa_supplicant /system/bin/wpa_supplicant \ +service p2p_supplicant /system/bin/wpa_supplicant \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ -I/system/etc/wifi/wpa_supplicant_overlay.conf \ - -O/data/misc/wifi/sockets \ - -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 + -O/data/misc/wifi/sockets -N \ + -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \ + -I/system/etc/wifi/p2p_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 @@ -595,39 +576,57 @@ service wpa_supplicant /system/bin/wpa_supplicant \ 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 \ +service wpa_supplicant /system/bin/wpa_supplicant \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ -I/system/etc/wifi/wpa_supplicant_overlay.conf \ - -O/data/misc/wifi/sockets -puse_p2p_group_interface=1 \ + -O/data/misc/wifi/sockets \ -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 + # 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 dhcpcd_wlan0 /system/bin/dhcpcd -aABDKL - class main + class late_start disabled oneshot service dhcpcd_p2p /system/bin/dhcpcd -aABKL - class main + class late_start disabled oneshot service iprenew_wlan0 /system/bin/dhcpcd -n - class main + class late_start disabled oneshot service iprenew_p2p /system/bin/dhcpcd -n - class main + class late_start + disabled + oneshot + +service dhcpcd_bnep0 /system/bin/dhcpcd -BKLG + disabled + oneshot + +service dhcpcd_bnep1 /system/bin/dhcpcd -BKLG + disabled + oneshot + +service dhcpcd_bnep2 /system/bin/dhcpcd -BKLG + disabled + oneshot + +service dhcpcd_bnep3 /system/bin/dhcpcd -BKLG + disabled + oneshot + +service dhcpcd_bnep4 /system/bin/dhcpcd -BKLG disabled oneshot diff --git a/rootdir/system/etc/firmware/wlan/prima/WCNSS_cfg.dat b/rootdir/system/etc/firmware/wlan/prima/WCNSS_cfg.dat Binary files differdeleted file mode 100644 index 5685e79..0000000 --- a/rootdir/system/etc/firmware/wlan/prima/WCNSS_cfg.dat +++ /dev/null diff --git a/rootdir/system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini b/rootdir/system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini deleted file mode 100644 index 9778686..0000000 --- a/rootdir/system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini +++ /dev/null @@ -1,371 +0,0 @@ -# This file allows user to override the factory - -# defaults for the WLAN Driver - - -# Enable IMPS or not -gEnableImps=1 - -# Enable/Disable Idle Scan - -gEnableIdleScan=0 - - -# Increase sleep duration (seconds) during IMPS -# 0 implies no periodic wake up from IMPS. Periodic wakeup is -# unnecessary if Idle Scan is disabled. -gImpsModSleepTime=0 - - -# Enable BMPS or not -gEnableBmps=1 - -# Enable suspend or not - -# 1: Enable standby, 2: Enable Deep sleep, 3: Enable Mcast/Bcast Filter - -gEnableSuspend=3 - - -# Phy Mode (auto, b, g, n, etc) -# Valid values are 0-9, with 0 = Auto, 4 = 11n, 9 = 11ac -gDot11Mode=0 - - -# CSR Roaming Enable(1) Disable(0) - -gRoamingTime=0 - - -# Assigned MAC Addresses - This will be used until NV items are in place - -# Each byte of MAC address is represented in Hex format as XX - -Intf0MacAddress=000AF58989FF -Intf1MacAddress=000AF58989FE -Intf2MacAddress=000AF58989FD - -Intf3MacAddress=000AF58989FC - - -# UAPSD service interval for VO,VI, BE, BK traffic - -InfraUapsdVoSrvIntv=0 - -InfraUapsdViSrvIntv=0 - -InfraUapsdBeSrvIntv=0 - -InfraUapsdBkSrvIntv=0 - -# Flag to allow STA send AddTspec even when ACM is Off -gAddTSWhenACMIsOff=1 - -# Make 1x1 the default antenna configuration - -gNumRxAnt=1 - - -# Beacon filtering frequency (unit in beacon intervals) - -gNthBeaconFilter=50 - - -# Enable WAPI or not - -# WAPIIsEnabled=0 - - -# Flags to filter Mcast abd Bcast RX packets. - -# Value 0: No filtering, 1: Filter all Multicast. - -# 2: Filter all Broadcast. 3: Filter all Mcast abd Bcast - -McastBcastFilter=3 - - -#Flag to enable HostARPOffload feature or not - -hostArpOffload=1 - - -#SoftAP Related Parameters - -# AP MAc addr - -gAPMacAddr=000AF589dcab - - -# 802.11n Protection flag - -gEnableApProt=1 - - -#Enable OBSS protection - -gEnableApOBSSProt=1 - - -#Enable/Disable UAPSD for SoftAP - -gEnableApUapsd=0 - - -# Fixed Rate - -gFixedRate=0 - - -# Maximum Tx power - -# gTxPowerCap=30 - - -# Fragmentation Threshold - -# gFragmentationThreshold=2346 - - -# RTS threshold - -RTSThreshold=2347 - - -# Intra-BSS forward - -gDisableIntraBssFwd=0 - - -# WMM Enable/Disable - -WmmIsEnabled=0 - - -# 802.11d support - -g11dSupportEnabled=1 - -# CCX Support and fast transition -CcxEnabled=0 -FastTransitionEnabled=1 -ImplicitQosIsEnabled=0 -gNeighborScanTimerPeriod=200 - -gNeighborLookupThreshold=78 - -gNeighborScanChannelMinTime=20 -gNeighborScanChannelMaxTime=30 - -# Legacy (non-CCX, non-802.11r) Fast Roaming Support -# To enable, set FastRoamEnabled=1 -# To disable, set FastRoamEnabled=0 -FastRoamEnabled=1 - -#Check if the AP to which we are roaming is better than current AP in terms of RSSI. -#Checking is disabled if set to Zero.Otherwise it will use this value as to how better -#the RSSI of the new/roamable AP should be for roaming -RoamRssiDiff=5 - -# SAP Country code - -# Default Country Code is 2 bytes, 3rd byte is optional indoor or out door. - -# Example - -# US Indoor, USI - -# Korea Outdoor, KRO - -# Japan without optional byte, JP - -# France without optional byte, FR - -#gAPCntryCode=USI - - -#Short Guard Interval Enable/disable - -gShortGI20Mhz=1 - -gShortGI40Mhz=1 - - -#Auto Shutdown Value in seconds. A value of 0 means Auto shutoff is disabled - -gAPAutoShutOff=0 - - -# SAP auto channel selection configuration - -# 0 = disable auto channel selection - -# 1 = enable auto channel selection, channel provided by supplicant will be ignored - -gApAutoChannelSelection=0 - - -# Listen Energy Detect Mode Configuration - -# Valid values 0-128 - -# 128 means disable Energy Detect feature - -# 0-9 are threshold code and 7 is recommended value from system if feature is to be enabled. - -# 10-128 are reserved. - -# The EDET threshold mapping is as follows in 3dB step: - -# 0 = -60 dBm - -# 1 = -63 dBm - -# 2 = -66 dBm - -# ... - -# 7 = -81 dBm - -# 8 = -84 dBm - -# 9 = -87 dBm - -# Note: Any of these settings are valid. Setting 0 would yield the highest power saving (in a noisy environment) at the cost of more range. The range impact is approximately #calculated as: - -# - -# Range Loss (dB) = EDET threshold level (dBm) + 97 dBm. - -# - -gEnablePhyAgcListenMode=128 - - -#Preferred channel to start BT AMP AP mode (0 means, any channel) - -BtAmpPreferredChannel=0 - - -#Preferred band (both or 2.4 only or 5 only) - -BandCapability=0 - - -#Beacon Early Termination (1 = enable the BET feature, 0 = disable) - -enableBeaconEarlyTermination=1 - -beaconEarlyTerminationWakeInterval=11 - - -#Bluetooth Alternate Mac Phy (1 = enable the BT AMP feature, 0 = disable) - -gEnableBtAmp=0 - - -#SOFTAP Channel Range selection - -gAPChannelSelectStartChannel=1 - -gAPChannelSelectEndChannel=11 - - -#SOFTAP Channel Range selection Operating band - -# 0:2.4GHZ 1: LOW-5GHZ 2:MID-5GHZ 3:HIGH-5GHZ 4: 4.9HZ BAND - -gAPChannelSelectOperatingBand=0 - - -#Channel Bonding -gChannelBondingMode5GHz=1 - - -#Enable Keep alive with non-zero period value - -gStaKeepAlivePeriod=30 - - -#Say gGoKeepAlivePeriod(5 seconds) and gGoLinkMonitorPeriod(10 seconds). -#For every 10 seconds DUT sends Qos Null frame(i.e., Keep Alive frame if link is idle for last 10 seconds.) -#For both active and power save clients. - -#Power save clients: DUT set TIM bit from 10th second onwards and till client honors TIM bit. -#If doesn't honor for 5 seconds then Driver remove client. - -#Active clients: DUT send Qos Null frame for 10th seconds onwards if it is not success still DUT try on -#11th second if not tries on 12th and so on till 15th second. Hence before disconnection DUT will send 5 NULL frames. -#Hence in any case DUT will detect client got removed in (10+5) seconds. i.e., (gGoKeepAlivePeriod +gGoLinkMonitorPeriod).. - -#gGoLinkMonitorPeriod/ gApLinkMonitorPeriod is period where link is idle and it is period -#where we send NULL frame. - -#gApLinkMonitorPeriod = 10 - -#gGoLinkMonitorPeriod = 10 - -#gGoKeepAlivePeriod/gApKeepAlivePeriod is time to spend to check whether frame are succeed to send or not. -#Hence total effective detection time is gGoLinkMonitorPeriod+ gGoKeepAlivePeriod/gApLinkMonitorPeriod+ gApKeepAlivePeriod. -#gGoKeepAlivePeriod = 5 - -#gApKeepAlivePeriod = 5 -#If set will start with active scan after driver load, otherwise will start with - -#passive scan to find out the domain - -#gEnableBypass11d=1 - - -#If set to 0, will not scan DFS channels - -gEnableDFSChnlScan=1 - - -gVhtChannelWidth=2 -gEnableLogp=1 - - -# Enable Automatic Tx Power control - -gEnableAutomaticTxPowerControl=1 - -# 0 for OLPC 1 for CLPC and SCPC -gEnableCloseLoop=1 - -#Data Inactivity Timeout when in powersave (in ms) -gDataInactivityTimeout=200 - -# VHT Tx/Rx MCS values -# Valid values are 0,1,2. If commented out, the default value is 0. -# 0=MCS0-7, 1=MCS0-8, 2=MCS0-9 -gVhtRxMCS=2 -gVhtTxMCS=2 - -gEnableLpwrImgTransition=1 - -# Enable Tx beamforming -gTxBFEnable=1 - -# Enable Tx LDPC -#gTxLdpcEnable = 1 for HT mode, 2 for VHT mode,3 for both HT and VHT -gTxLdpcEnable=3 - -#FlexConnect Power Factor -#Default is set to 0 (disable) -gFlexConnectPowerFactor=0 - -# Valid values are 2048,4096,8192 and so on -# Please don't use values other than the ones mentioned above -gMaxMediumTime=4096 - -# 802.11K support -gRrmEnable=1 -gRrmOperChanMax=8 -gRrmNonOperChanMax=8 -gRrmRandIntvl=100 - -END - -# Note: Configuration parser would not read anything past the END marker - diff --git a/rootdir/system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin b/rootdir/system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin Binary files differdeleted file mode 100644 index a8dd301..0000000 --- a/rootdir/system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin +++ /dev/null diff --git a/rootdir/system/etc/init.qcom.wifi.sh b/rootdir/system/etc/init.qcom.wifi.sh deleted file mode 100644 index ea83027..0000000 --- a/rootdir/system/etc/init.qcom.wifi.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/system/bin/sh - -if [ -e /data/misc/wifi/WCNSS_qcom_wlan_cal.bin ]; then - calparm=`ls /sys/module/wcnsscore/parameters/has_calibrated_data` - if [ -e $calparm ] && [ ! -e /data/misc/wifi/WCN_FACTORY ]; then - echo 1 > $calparm - fi -fi - -# There is a device file. Write to the file -# so that the driver knows userspace is -# available for firmware download requests -echo 1 > /dev/wcnss_wlan -echo $serialno > /sys/devices/fb000000.qcom,wcnss-wlan/serial_number - -exit 0 @@ -132,21 +132,14 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ com.android.future.usb.accessory -# WiFi +# Wifi PRODUCT_PACKAGES += \ - mac-update \ - wcnss_service + libnetcmdiface PRODUCT_COPY_FILES += \ $(COMMON_PATH)/rootdir/system/etc/wifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \ $(COMMON_PATH)/rootdir/system/etc/wifi/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/rootdir/system/etc/init.qcom.wifi.sh:system/etc/init.qcom.wifi.sh \ - $(COMMON_PATH)/rootdir/system/etc/firmware/wlan/prima/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \ - $(COMMON_PATH)/rootdir/system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini:system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini \ - $(COMMON_PATH)/rootdir/system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin:system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin - # Set default USB interface PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ persist.sys.usb.config=mtp @@ -206,10 +199,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.hwui.text_large_cache_width=2048 \ ro.hwui.text_large_cache_height=1024 -# Bluetooth -PRODUCT_PROPERTY_OVERRIDES += \ - ro.qualcomm.bt.hci_transport=smd - # GPS PRODUCT_PROPERTY_OVERRIDES += \ persist.gps.qc_nlp_in_use=0 \ @@ -247,5 +236,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.debug.wfd.enable=1 \ persist.sys.wfd.virtual=0 +# BCM Wifi +$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/config/config-bcm.mk) + # Include non-opensource parts $(call inherit-product, vendor/sony/shinano-common/shinano-common-vendor.mk) |