shinano-common: cleanup rootdir ramdisk scripts

* also clean bluetooth stuff

Change-Id: Ib76be395aa584553c758c23063e233b54e41a856

2 files changed, 50 insertions, 71 deletions

diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc
index e097966..5a4655e 100644
--- a/rootdir/init.camera.rc
+++ b/rootdir/init.camera.rc
@@ -14,21 +14,17 @@
 # limitations under the License.
 #
 
-
-
 on init
 	export LD_SHIM_LIBS /system/vendor/lib/libwvm.so|libshims_wvm.so:/system/bin/credmgrd|libshims_signal.so:/system/bin/iddd|libshims_idd.so:/system/bin/suntrold|libshims_signal.so
 
 	mkdir /idd 0751 idd idd
 	mkdir /rca 0750 idd idd
 
-
 on early-fs
     wait /dev/block/mmcblk0p1
     class_start trimarea
     exec u:r:qti_init_shell:s0 -- /sbin/wait4tad_static
 
-
 on fs
     # mount apps_log
     #wait /dev/block/platform/msm_sdcc.1/by-name/apps_log
@@ -38,46 +34,27 @@ on fs
     #exec /system/bin/rm -r /idd/lost+found
     symlink /idd /mnt/idd
 
-
-
-
 on early-boot
     #SONY early boot
     start ta_qmi_service
     start sct_service
     start mlog_qmi_service
 
-
 on boot
-    # Create QMUX deamon socket area
-    mkdir /dev/socket/qmux_radio 0770 radio radio
-    chmod 2770 /dev/socket/qmux_radio
-    mkdir /dev/socket/qmux_audio 0770 media audio
-    chmod 2770 /dev/socket/qmux_audio
-    mkdir /dev/socket/qmux_bluetooth 0770 bluetooth bluetooth
-    chmod 2770 /dev/socket/qmux_bluetooth
-    mkdir /dev/socket/qmux_gps 0770 gps gps
-    chmod 2770 /dev/socket/qmux_gps
-    mkdir /dev/socket/qmux_nfc 0770 nfc nfc
-    chmod 2770 /dev/socket/qmux_nfc
-
-
-       # PM8941 flash
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/current1
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/current2
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/fault_status
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/fine_current1
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/fine_current2
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/flash_timer
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/mask_clamp_current
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/mask_enable
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/max_current
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/mode
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/startup_delay
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/strobe
-       chown cameraserver system /sys/class/misc/pm8941-flash/device/vph_pwr_droop
-
-
+    # PM8941 flash
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/current1
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/current2
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/fault_status
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/fine_current1
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/fine_current2
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/flash_timer
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/mask_clamp_current
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/mask_enable
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/max_current
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/mode
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/startup_delay
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/strobe
+    chown cameraserver system /sys/class/misc/pm8941-flash/device/vph_pwr_droop
 
 on post-fs
      # we will remap this as /mnt/sdcard with the sdcard fuse tool
@@ -88,7 +65,6 @@ on post-fs
      mkdir /dev/socket/scd 0755 system system
      mkdir /data/scd 0755 system system
 
-
 on post-fs-data
     # SONY: Start early TA-users
     mkdir /data/etc 0755 root shell
@@ -98,13 +74,13 @@ on post-fs-data
 
     mkdir /data/credmgr 0770 system credmgr_client
 
-        # SONY: Create dir for Widevine keybox
-        mkdir /data/persist/wv 0700 system system
+    # SONY: Create dir for Widevine keybox
+    mkdir /data/persist/wv 0700 system system
 
-        mkdir /data/misc/systemkeys 0700 system system
-        mkdir /data/misc/keystore 0700 keystore keystore
-        mkdir /data/misc/keychain 0771 system system
-        installkey /data
+    mkdir /data/misc/systemkeys 0700 system system
+    mkdir /data/misc/keystore 0700 keystore keystore
+    mkdir /data/misc/keychain 0771 system system
+    installkey /data
 
     mkdir /idd/lost+found 0770 root root
     mkdir /idd/output 0755 idd idd
@@ -134,7 +110,6 @@ service iddd /system/bin/iddd
     user idd
     group idd log inet
 
-
 # Start Credential manager daemon
 service credmgrd /system/bin/credmgrd
     user system
@@ -142,7 +117,6 @@ service credmgrd /system/bin/credmgrd
     socket credmgr stream 0660 system credmgr_client
     class main
 
-
 #doesn't exist on shinano. Keept for compat purpose
 # Start Security Daemon
 service secd /system/bin/secd
@@ -217,22 +191,3 @@ service cameraserver /system/bin/cameraserver
     ioprio rt 4
 #    seclabel u:r:cameraserver:s0
     writepid /dev/cpuset/foreground/tasks
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index a8fc56b..ebcab1f 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -55,9 +55,11 @@ on init
     setprop ro.bt.bdaddr_path "/data/etc/bluetooth_bdaddr"
     chown bluetooth bluetooth ${ro.bt.bdaddr_path}
 
-    # bluetooth LPM
-    chown bluetooth net_bt_stack /proc/bluetooth/sleep/lpm
-    chown bluetooth net_bt_stack /proc/bluetooth/sleep/btwrite
+    setprop ro.bluetooth.hfp.ver 1.6
+    setprop bluetooth.a2dp.sink.enabled false
+    setprop bluetooth.enable_timeout_ms 12000
+    chown bluetooth net_bt_admin /proc/bluetooth/wakeup/proto
+    chmod 0664 /proc/bluetooth/wakeup/proto
 
     write /sys/module/qpnp_rtc/parameters/poweron_alarm 1
 
@@ -104,14 +106,32 @@ on boot
     write /sys/module/qpnp_power_on/parameters/forcecrash_on 1
 
     # Bluetooth
-    chown bluetooth net_bt /sys/class/rfkill/rfkill0/type
-    chown bluetooth net_bt /sys/class/rfkill/rfkill0/state
+    chown bluetooth net_bt_admin /sys/class/rfkill/rfkill0/type
+    chown bluetooth net_bt_admin /sys/class/rfkill/rfkill0/state
+    # bluetooth LPM
+    chown bluetooth net_bt_stack /proc/bluetooth/sleep/lpm
+    chown bluetooth net_bt_stack /proc/bluetooth/sleep/btwrite
+
+    # BT DUN port-bridge		
+    chmod 0660 /dev/smd7		
+    chown bluetooth bluetooth /dev/smd7
+
     chmod 0660 /sys/class/rfkill/rfkill0/state
-    chown bluetooth net_bt /dev/ttyHS0
+    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
 
+    #Create QMUX deamon socket area
+    mkdir /dev/socket/qmux_radio 0770 radio radio
+    chmod 2770 /dev/socket/qmux_radio
+    mkdir /dev/socket/qmux_audio 0770 media audio
+    chmod 2770 /dev/socket/qmux_audio
+    mkdir /dev/socket/qmux_bluetooth 0770 bluetooth bluetooth
+    chmod 2770 /dev/socket/qmux_bluetooth
+    mkdir /dev/socket/qmux_gps 0770 gps gps
+    chmod 2770 /dev/socket/qmux_gps
+
     # Create PERFD deamon related dirs
     mkdir /data/misc/perfd 0755 root system
     chmod 2755 /data/misc/perfd
@@ -406,6 +426,10 @@ on post-fs-data
 on property:init.svc.wpa_supplicant=stopped
     stop dhcpcd
 
+on property:bluetooth.isEnabled=true
+#    start btwlancoex
+    write /sys/class/bluetooth/hci0/idle_timeout 7000
+
 # QMUX must be in multiple groups to support external process connections
 service qmuxd /system/bin/qmuxd
     class main