Skip to content

Commit

Permalink
Changes for BT
Browse files Browse the repository at this point in the history
  • Loading branch information
Daz Jones committed Dec 24, 2012
1 parent e429b32 commit b96adba
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 157 deletions.
3 changes: 1 addition & 2 deletions device.mk
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ PRODUCT_COPY_FILES += \
device/zte/blade2/prebuilt/7k_handset.kl:system/usr/keylayout/7k_handset.kl \
device/zte/blade2/prebuilt/Generic.kl:system/usr/keylayout/Generic.kl \
device/zte/blade2/prebuilt/AVRCP.kl:system/usr/keylayout/AVRCP.kl \
device/zte/blade2/init.qcom.fm.sh:system/etc/init.qcom.fm.sh \
device/zte/blade2/init.qcom.bt.sh:system/etc/init.qcom.bt.sh
device/zte/blade2/init.qcom.fm.sh:system/etc/init.qcom.fm.sh

# Wi-Fi
PRODUCT_COPY_FILES += \
Expand Down
31 changes: 9 additions & 22 deletions init.blade2.rc
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@ on boot

# Setup bluetooth
mkdir /data/misc/bluetooth 0770 bluetooth bluetooth
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 /sys/class/rfkill/rfkill1/state
chown bluetooth bluetooth /proc/bluetooth/sleep/proto
chown bluetooth bluetooth /proc/bcm/sleep/proto
chown bluetooth net_bt_stack /sys/module/bluetooth_power/parameters/power
chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/type
chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/state
chown bluetooth net_bt_stack /sys/class/rfkill/rfkill1/state
chown bluetooth net_bt_stack /proc/bluetooth/sleep/proto
chown bluetooth net_bt_stack /proc/bcm/sleep/proto
chown system system /sys/module/sco/parameters/disable_esco
chmod 0660 /sys/module/bluetooth_power/parameters/power
chmod 0660 /sys/class/rfkill/rfkill0/state
chmod 0660 /sys/class/rfkill/rfkill1/state
chmod 0660 /proc/bluetooth/sleep/proto
chmod 0660 /proc/bcm/sleep/proto
chown bluetooth bluetooth /dev/ttyHS0
chown bluetooth net_bt_stack /dev/ttyHS0
chmod 0666 /dev/ttyHS0
chown bluetooth bluetooth /sys/devices/platform/msm_serial_hs.0/clock
chown bluetooth net_bt_stack /sys/devices/platform/msm_serial_hs.0/clock
chmod 0660 /sys/devices/platform/msm_serial_hs.0/clock

# Sensors
Expand Down Expand Up @@ -102,6 +102,7 @@ service qmuxd /system/bin/qmuxd
class main
user radio

# FIXME: Are these no longer needed or do they need to be fixed?
# Necessary to have functional Bluetooth with Wi-Fi disabled.
on property:init.svc.hciattach=running
write /sys/class/rfkill/rfkill1/state 1
Expand All @@ -116,20 +117,6 @@ on property:init.svc.bluetoothd=running
on property:init.svc.bluetoothd=stopped
stop abtfilt

service hci_qcomm_init /system/bin/log -t qcom-bluetooth -p i "hci_qcomm_init service requested"
class main
user bluetooth
group bluetooth net_bt_admin
disabled
oneshot

service hciattach /system/bin/sh /system/etc/init.qcom.bt.sh
class main
user root
group qcom_oncrpc bluetooth net_bt_admin system
disabled
oneshot

on property:init.svc.wpa_supplicant=stopped
stop dhcpcd_wlan0

Expand Down
133 changes: 0 additions & 133 deletions init.qcom.bt.sh

This file was deleted.

0 comments on commit b96adba

Please sign in to comment.