Bluetooth: Merge system/core script changes (.rc & .sh) of 'ics' to 'jb'.
Squashed commit of the following: commit fef7046a2ace2c5e766d1eab249f86523213d702 Author: Royston Rodrigues <roystonr@codeaurora.org> Date: Thu Jul 12 08:42:20 2012 +0530 Bluetooth: Add permissions for smd and rfcomm device nodes. Change-Id: Id4bbb9269635560ec71880eb340fafc5c6b85878 commit 4eab8848774920ec0ed786f57446f831b2e6a5c9 Author: Peter Krystad <pkrystad@codeaurora.org> Date: Mon Mar 12 16:46:55 2012 -0700 Bluetooth: Remove references to amploader utility Amploader utility was specific to 1312 chip, and functionality has been disabled. Remove these references so the utility itself can be removed. Change-Id: I40e842309dbd24c98e240753c53748e432583f18 CRs-fixed: 336688 Change-Id: I0474027db9bccffcf4ab42c9f652a2b5a0aaed78
This commit is contained in:
parent
411916ce37
commit
762e8625ed
|
@ -77,9 +77,6 @@ on boot
|
|||
|
||||
setprop wifi.interface wlan0
|
||||
|
||||
# Enable Bluetooth 802.11 PAL when Bluetooth is turned on
|
||||
setprop ro.config.bt.amp no
|
||||
|
||||
#Set SUID bit for usbhub
|
||||
chmod 4755 /system/bin/usbhub
|
||||
chmod 755 /system/bin/usbhub_init
|
||||
|
@ -228,12 +225,8 @@ on property:init.svc.wpa_supplicant=stopped
|
|||
|
||||
on property:bluetooth.isEnabled=true
|
||||
start btwlancoex
|
||||
start amp_load
|
||||
write /sys/class/bluetooth/hci0/idle_timeout 7000
|
||||
|
||||
on property:bluetooth.isEnabled=false
|
||||
start amp_unload
|
||||
|
||||
service qcom-c_core-sh /system/bin/sh /init.qcom.class_core.sh
|
||||
class core
|
||||
user root
|
||||
|
|
|
@ -167,43 +167,12 @@ case "$target" in
|
|||
echo "******* WI-FI may not work ***********************************"
|
||||
;;
|
||||
esac
|
||||
case "$wifishd" in
|
||||
"ok")
|
||||
;;
|
||||
"loading")
|
||||
;;
|
||||
*)
|
||||
case "$wlanchip" in
|
||||
"WCN1314")
|
||||
;;
|
||||
|
||||
"WCN1312")
|
||||
/system/bin/amploader -i
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
esac
|
||||
;;
|
||||
msm7627*)
|
||||
mount -t vfat -o remount,rw,barrier=0 /dev/block/mtdblock1 /system
|
||||
ln -s /data/hostapd/qcom_cfg.ini /etc/firmware/wlan/qcom_cfg.ini
|
||||
ln -s /persist/qcom_wlan_nv.bin /etc/firmware/wlan/qcom_wlan_nv.bin
|
||||
mount -t vfat -o remount,ro,barrier=0 /dev/block/mtdblock1 /system
|
||||
wifishd=`getprop wlan.driver.status`
|
||||
case "$wifishd" in
|
||||
"ok")
|
||||
;;
|
||||
"loading")
|
||||
;;
|
||||
*)
|
||||
# For the new .38 kernel for 1312, there was an FFA panic
|
||||
# when no 1312/1314 chip was present. Hence this is commented out
|
||||
# Will need to reenable this code for 1312.
|
||||
#
|
||||
# /system/bin/amploader -i
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
*)
|
||||
|
|
|
@ -62,3 +62,7 @@
|
|||
/dev/msm_evrc 0660 system audio
|
||||
/dev/msm_wma 0660 system audio
|
||||
/dev/msm_wmapro 0660 system audio
|
||||
/dev/smd3 0660 bluetooth bluetooth
|
||||
/dev/smd2 0660 bluetooth bluetooth
|
||||
/dev/smd7 0640 radio radio
|
||||
/dev/rfcomm0 0660 bluetooth bluetooth
|
||||
|
|
Loading…
Reference in New Issue