n7000: Bring storage configuration in line with I9100/I777

Swaps /sdcard and /emmc in most cases

Also permits USB OTG storage devices to work

Change-Id: I44a60b7663ea918f5e4870606985d1cd6441aaa5

7 files changed, 30 insertions, 23 deletions

diff --git a/configs/vold.fstab b/configs/vold.fstab
index d52e0ee..13658ce 100644
--- a/configs/vold.fstab
+++ b/configs/vold.fstab
@@ -13,10 +13,10 @@
 ######################
 
 # internal sdcard
-dev_mount internal /mnt/sdcard 11 /devices/platform/dw_mmc/mmc_host/mmc0/mmc0 encryptable_nonremovable
+dev_mount emmc /mnt/emmc 11 /devices/platform/dw_mmc/mmc_host/mmc0/mmc0 nonremovable,encryptable
 
 # external sdcard
-dev_mount sdcard /mnt/emmc auto /devices/platform/s3c-sdhci.2/mmc_host/mmc1
+dev_mount sdcard /mnt/sdcard auto /devices/platform/s3c-sdhci.2/mmc_host/mmc1
 
 # USB storage device
-dev_mount usbdisk /mnt/usbdisk auto /devices/platform/s5p-ehci
+dev_mount usbdisk /mnt/usbdisk auto /devices/platform/s3c_otghcd/usb
diff --git a/init.smdk4210.rc b/init.smdk4210.rc
index f7d43d6..53da0e1 100644
--- a/init.smdk4210.rc
+++ b/init.smdk4210.rc
@@ -1,33 +1,33 @@
 import init.smdk4210.usb.rc
 
 on early-init
-	export EXTERNAL_STORAGE /mnt/sdcard
     export SECONDARY_STORAGE /mnt/emmc
+    export EXTERNAL_STORAGE /mnt/sdcard
     mkdir /mnt 0775 system system
     mkdir /mnt/sdcard 0775 system system
     mkdir /mnt/emmc 0775 system system
     mkdir /mnt/usbdisk 0775 system system
     mkdir /efs 0771 radio system
-	mkdir /preload 0771 system system
-	mkdir /mnt/.lfs 0755 root root
+    mkdir /preload 0771 system system
+    mkdir /mnt/.lfs 0755 root root
 
-	# for backwards compatibility
-	symlink /mnt/sdcard /sdcard
-	symlink /mnt/emmc /emmc
+    # for backwards compatibility
+    symlink /mnt/sdcard /sdcard
+    symlink /mnt/emmc /emmc
 
 # Disable CFQ slice idle delay
     write /sys/block/mmcblk0/queue/iosched/slice_idle 0
 
 # FIXME: permissions for tvout
-	chmod 0777 /dev/graphics/fb0
-	chmod 0777 /dev/graphics/fb10
-	chmod 0777 /dev/graphics/fb11	
+    chmod 0777 /dev/graphics/fb0
+    chmod 0777 /dev/graphics/fb10
+    chmod 0777 /dev/graphics/fb11	
     chown media graphics /sys/class/switch/hdmi
     chmod 0777 /sys/class/switch/hdmi
 
 # FIXME: permission for HDMI audio path
     chown media audio /sys/class/hdmi_audio/hdmi_audio/hdmi_audio_set_ext
-	chmod 0777 /sys/class/hdmi_audio/hdmi_audio/hdmi_audio_set_ext
+    chmod 0777 /sys/class/hdmi_audio/hdmi_audio/hdmi_audio_set_ext
 
 on fs
 # mount ext4 partitions
diff --git a/lpm.rc b/lpm.rc
index 07dc102..8b8bed8 100644
--- a/lpm.rc
+++ b/lpm.rc
@@ -6,8 +6,8 @@ on init
     export LD_LIBRARY_PATH /vendor/lib:/system/lib
     export ANDROID_ROOT /system
     export ANDROID_DATA /data
+    export SECONDARY_STORAGE /mnt/emmc
     export EXTERNAL_STORAGE /mnt/sdcard
-    export PHONE_STORAGE /mnt/emmc
 
     symlink /system/etc /etc
     mkdir /mnt 0775 root system
diff --git a/n7000.mk b/n7000.mk
index 9f936bb..390f30b 100755
--- a/n7000.mk
+++ b/n7000.mk
@@ -38,7 +38,10 @@ PRODUCT_COPY_FILES += \
 	device/samsung/n7000/configs/vold.fstab:system/etc/vold.fstab
 
 PRODUCT_PROPERTY_OVERRIDES := \
-    ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
+	ro.vold.switchablepair=/mnt/emmc,/mnt/sdcard
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+	persist.sys.vold.switchexternal=1
 
 # Wifi
 PRODUCT_COPY_FILES += \
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
index 0bca789..99dd14a 100644
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -33,15 +33,17 @@
 -->
 
 <StorageList xmlns:android="http://schemas.android.com/apk/res/android">
-    <storage android:mountPoint="/mnt/sdcard"
+    <storage android:mountPoint="/mnt/emmc"
              android:storageDescription="@string/storage_internal"
-             android:primary="true"
-             android:removable="false" />
+             android:primary="false"
+             android:removable="false"
+             android:allowMassStorage="true" />
 
-    <storage android:mountPoint="/mnt/emmc"
+    <storage android:mountPoint="/mnt/sdcard"
              android:storageDescription="@string/storage_sd_card"
-             android:primary="false"
-             android:removable="true" />
+             android:primary="true"
+             android:removable="false"
+             android:allowMassStorage="true" />
 
     <storage android:mountPoint="/mnt/usbdisk"
              android:storageDescription="@string/storage_usb"
diff --git a/recovery.fstab b/recovery.fstab
index 78624dc..457ea15 100644
--- a/recovery.fstab
+++ b/recovery.fstab
@@ -9,5 +9,5 @@
 /data		ext4		/dev/block/mmcblk0p10
 /preload 	ext4		/dev/block/mmcblk0p12
 
-/sdcard		vfat		/dev/block/mmcblk0p11
-/emmc		vfat		/dev/block/mmcblk1p1
+/emmc		vfat		/dev/block/mmcblk0p11
+/sdcard		vfat		/dev/block/mmcblk1p1
diff --git a/recovery.rc b/recovery.rc
index 53a0b2f..d9fbb50 100644
--- a/recovery.rc
+++ b/recovery.rc
@@ -5,6 +5,8 @@ on init
     export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
     export ANDROID_ROOT /system
     export ANDROID_DATA /data
+    export ANDROID_CACHE /cache
+    export SECONDARY_STORAGE /emmc
     export EXTERNAL_STORAGE /sdcard
 
     symlink /system/etc /etc