n5100: merge into common repo kona-common

5 files changed, 6 insertions, 326 deletions

diff --git a/rootdir/fstab.smdk4x12 b/rootdir/fstab.smdk4x12
deleted file mode 100644
index 5068276..0000000
--- a/rootdir/fstab.smdk4x12
+++ /dev/null
@@ -1,19 +0,0 @@
-# Android fstab file.
-#<src>                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-# data partition must be located at the bottom for supporting device encryption
-/dev/block/mmcblk0p9    /system             ext4      ro,errors=panic                                                                   wait
-/dev/block/mmcblk0p3    /efs                ext4      nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic    wait,check
-/dev/block/mmcblk0p8    /cache              ext4      nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic    wait,check
-/dev/block/mmcblk0p12   /data               ext4      nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic    wait,check,encryptable=footer
-
-# vold-managed volumes ("block device" is actually a sysfs devpath)  
-/devices/platform/s3c-sdhci.2/mmc_host/mmc1     /storage/sdcard1        auto        defaults    voldmanaged=sdcard1:auto  
-/devices/platform/s5p-ehci                      /storage/usbdisk0       auto        defaults    voldmanaged=usbdisk0:auto
-
-# recovery
-/dev/block/mmcblk0p5                            /boot                   emmc        defaults    recoveryonly
-/dev/block/mmcblk0p6                            /recovery               emmc        defaults    recoveryonly
-/dev/block/mmcblk0p7                            /modem                  emmc        defaults    recoveryonly
-/dev/block/mmcblk1p1                            /external_sd            auto        defaults    recoveryonly
diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc
index d0b9305..32b2a14 100755
--- a/rootdir/init.smdk4x12.rc
+++ b/rootdir/init.smdk4x12.rc
@@ -1,4 +1,5 @@
 import init.smdk4x12.usb.rc
+import init.bt.rc
 
 on init
     mkdir /mnt/shell/emulated 0700 shell shell
@@ -154,14 +155,10 @@ on post-fs-data
     chown system radio /sys/class/sec/sec_touchkey/touchkey_dummy_btn1
     chown system radio /sys/class/sec/sec_touchkey/touchkey_dummy_btn3
     chown system radio /sys/class/sec/sec_touchkey/touchkey_dummy_btn5
-	chown system radio /sys/class/sec/sec_touchkey/touchkey_menu
     chown system radio /sys/class/sec/sec_touchkey/extra_button_event
     chown system radio /sys/class/sec/sec_touchkey/touchkey_button_all
-	chown system radio /sys/class/sec/sec_touchkey/touchkey_button_status
     chown system radio /sys/class/sec/sec_touchkey/touchkey_threshold
-	chown system radio /sys/class/sec/sec_touchkey/brightness
     chmod 0660 /sys/class/sec/sec_touchkey/extra_button_event
-	chown system system /sys/devices/virtual/sec/sec_touchkey/brightness
 
 # Permissions for Hall IC
 	chown system radio /sys/class/sec/sec_key/hall_detect
@@ -283,6 +280,7 @@ on post-fs-data
     
 # Permissions for Touchkey
 	chown system radio /sys/class/sec/sec_touchkey/enable_disable
+	chown system radio /sys/class/sec/sec_touchkey/touchkey_brightness
 	chown system radio /sys/class/sec/sec_touchkey/touchkey_menu
 	chown system radio /sys/class/sec/sec_touchkey/touchkey_back
 	chown system radio /sys/class/sec/sec_touchkey/touch_update
@@ -488,7 +486,7 @@ on property:ro.uart_debug=0
 service at_distributor /system/bin/at_distributor
     class main
     user root
-    group radio log
+    group radio lo
 
 # create virtual SD card at /mnt/sdcard, based on the /data/media directory
 # daemon will drop to user/group system/media_rw after initializing
@@ -531,7 +529,7 @@ service dhcpcd_p2p /system/bin/dhcpcd -aABKL
     disabled
     oneshot
 
-service dhcpcd_bnep0 /system/bin/dhcpcd -ABKL
+service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
 	class main
 	disabled
 	oneshot
@@ -546,7 +544,7 @@ service iprenew_p2p /system/bin/dhcpcd -n
     disabled
     oneshot
 
-service iprenew_bnep0 /system/bin/dhcpcd -n
+service iprenew_bt-pan /system/bin/dhcpcd -n
 	class main
 	disabled
 	oneshot
@@ -568,7 +566,7 @@ service cpboot-daemon /sbin/cbd -d
     class main
     user root
     group radio cache inet misc audio sdcard_rw log sdcard_r
-
+    
 service orientationd /system/bin/orientationd
     class main
     user compass
diff --git a/rootdir/init.smdk4x12.usb.rc b/rootdir/init.smdk4x12.usb.rc
deleted file mode 100755
index 6c4bca2..0000000
--- a/rootdir/init.smdk4x12.usb.rc
+++ /dev/null
@@ -1,134 +0,0 @@
-on init
-    write /sys/class/android_usb/android0/iSerial $ro.serialno
-    write /sys/class/android_usb/android0/f_rndis/manufacturer Samsung
-    write /sys/class/android_usb/android0/f_rndis/vendorID 04e8
-    write /sys/class/android_usb/android0/f_rndis/wceis 1
-
-on boot
-    write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer
-    write /sys/class/android_usb/android0/iProduct $ro.product.model
-    write /sys/class/android_usb/android0/iSerial $ro.serialno
-    write /sys/class/android_usb/f_mass_storage/inquiry_string "Samsung"
-
-on property:sys.usb.config=mtp
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 6860
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-
-on property:sys.usb.config=mtp,adb
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 6860
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    start adbd
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=rndis
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 6863
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/bDeviceClass 224
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=rndis,adb
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 6864
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/bDeviceClass 224
-    write /sys/class/android_usb/android0/enable 1
-    start adbd
-    setprop sys.usb.state ${sys.usb.config}
-on property:sys.usb.config=ptp
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 6865
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=ptp,adb
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 6866
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    start adbd
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=rndis,dm
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 6862
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=rndis,acm,dm
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 6862
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=mass_storage
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 685B
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=mass_storage,adb
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 685e
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    start adbd
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=mass_storage,acm
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 685e
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-# rndis,acm,diag and diag,acm,adb used for Hidden Menu
-
-on property:sys.usb.config=rndis,diag
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 6862
-    write /sys/class/android_usb/android0/f_diag/clients diag_mdm
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=diag,acm,adb
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04E8
-    write /sys/class/android_usb/android0/idProduct 6860
-    write /sys/class/android_usb/android0/f_diag/clients diag_mdm
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    start adbd
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=rndis,acm,diag
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04E8
-    write /sys/class/android_usb/android0/idProduct 6864
-    write /sys/class/android_usb/android0/f_diag/clients diag_mdm
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
diff --git a/rootdir/lpm.rc b/rootdir/lpm.rc
deleted file mode 100644
index a9a183d..0000000
--- a/rootdir/lpm.rc
+++ /dev/null
@@ -1,82 +0,0 @@
-on early-init
-    start ueventd
-
-on init
-
-    export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
-    export LD_LIBRARY_PATH /vendor/lib:/system/lib
-    export ANDROID_ROOT /system
-    export ANDROID_DATA /data
-    export EXTERNAL_STORAGE /sdcard
-
-    symlink /system/etc /etc
-
-    mkdir /sdcard
-    mkdir /preload
-    mkdir /system
-    mkdir /data
-    mkdir /cache
-    mkdir /efs
-    mkdir /tmp
-    mkdir /dbdata
-    mkdir /mnt 0775 root root
-    #mount /tmp /tmp tmpfs   
-
-on early-fs
-#	insmod /lib/modules/vibrator.ko
-
-    mount ext4 /dev/block/mmcblk0p9 /system ro wait noatime
-
-	mkdir /data/log 0777
-
-	chmod 0666 /dev/log/radio
-	chmod 0666 /dev/log/main
-	chmod 0666 /dev/log/event    
-
-on boot
-#	write /sys/class/sec/switch/usb_sel PDA
-
-# CPU Frequency Governor
-	write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor pegasusq
-
-# EHCI runtime enable for LPA
-	write /sys/devices/platform/s5p-ehci/power/control auto
-
-	ifup lo
-	hostname localhost
-	domainname localdomain
-
-	class_start default
-
-service debuggerd /system/bin/debuggerd
-
-service ueventd /sbin/ueventd
-    	critical
-
-#service console /bin/sh
-service console /system/bin/sh
-	console
-
-service playlpm /system/bin/playlpm
-    	user root
-
-service immvibed /system/bin/immvibed 
-	oneshot
-
-service lpmkey /system/bin/lpmkey
-    	user root
-
-# adbd is controlled by the persist.service.adb.enable system property
-service adbd /sbin/adbd
-    disabled
-
-# adbd on at boot in emulator
-on property:ro.kernel.qemu=1
-    start adbd
-
-on property:persist.service.adb.enable=1
-    start adbd
-
-on property:persist.service.adb.enable=0
-    stop adbd
-
diff --git a/rootdir/ueventd.smdk4x12.rc b/rootdir/ueventd.smdk4x12.rc
deleted file mode 100644
index f073117..0000000
--- a/rootdir/ueventd.smdk4x12.rc
+++ /dev/null
@@ -1,83 +0,0 @@
-/dev/mali                 0666   system     system
-/dev/ump                  0666   system     graphics
-/dev/ion                  0666   system     system
-/dev/exynos-mem           0666   system     graphics
-
-/dev/media0               0660   system     system
-/dev/media1               0660   system     camera
-/dev/media2               0660   system     camera
-/dev/v4l-subdev0          0660   system     system
-/dev/v4l-subdev1          0660   system     system
-/dev/v4l-subdev3          0660   system     system
-/dev/v4l-subdev4          0660   system     system
-/dev/v4l-subdev5          0660   system     system
-/dev/v4l-subdev6          0660   system     system
-/dev/v4l-subdev7          0660   system     system
-/dev/v4l-subdev8          0660   system     system
-/dev/v4l-subdev9          0660   system     system
-/dev/v4l-subdev10         0660   system     system
-/dev/v4l-subdev11         0660   system     system
-/dev/v4l-subdev12         0660   system     system
-/dev/v4l-subdev13         0660   system     system
-/dev/v4l-subdev14         0660   system     system
-/dev/v4l-subdev15         0660   system     system
-/dev/v4l-subdev16         0660   system     system
-/dev/v4l-subdev17         0660   system     system
-
-/dev/video0               0660   system     camera
-/dev/video1               0660   system     camera
-/dev/video2               0660   system     camera
-/dev/video3               0660   system     camera
-/dev/video4               0666   system     graphics
-/dev/video11              0666   system     system
-/dev/video12              0666   system     system
-/dev/video20              0660   system     system
-/dev/video6               0660   media      graphics
-/dev/video7               0660   media      graphics
-
-/dev/video11              0666   system     graphics
-/dev/video12              0660   system     camera
-
-/dev/video16              0660   system     system
-/dev/video17              0660   system     system
-/dev/video18              0660   system     system
-/dev/video19              0660   system     system
-
-# Rotator
-/dev/video21              0660   system     system
-
-/dev/video23              0660   system     system
-/dev/video24              0660   system     system
-/dev/video25              0660   system     camera
-/dev/video26              0666   media      graphics
-/dev/video29              0666   media      graphics
-/dev/video32              0660   media      graphics
-
-/dev/video33              0660   system     system
-/dev/video34              0660   system     system
-
-/dev/video40              0660   system     camera
-/dev/video41              0660   system     camera
-/dev/video42              0660   system     camera
-/dev/video43              0660   system     camera
-
-/dev/i2c-2                0660   system     system
-/dev/i2c-5                0660   system     system
-/dev/CEC                  0660   system     system
-/dev/HPD                  0660   system     system
-/dev/fimg2d               0666   system     graphics
-/dev/fmradio              0660   system     audio
-
-#ALP Audio
-/dev/srp                  0660   system     audio
-
-/dev/s3c-mfc              0666   system     graphics
-/dev/s5p-mfc              0666   system     graphics
-
-/dev/umts*                0660   system     radio
-/dev/ttyUSB0              0666   system     system
-/dev/ttyUSB1              0666   system     system
-/dev/ttyUSB2              0666   system     system
-/dev/usb/lp*              0660   system     usb
-/dev/block/mmcblk0p4	  0660	 system	    system
-/dev/block/mmcblk0p7	  0660	 system	    radio