summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Echols <atechols@gmail.com>2012-09-25 12:04:06 -0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-09-25 12:04:06 -0400
commit7ea93ef6ee563866f3d5d47d9bea3049c282a67e (patch)
tree605dd36ebfccf9a6f3b66c585770ebd7ed430183
parentaac79ca5d69590dd5c1a9be50b82bc2dc31b325c (diff)
downloadtf700t-7ea93ef6ee563866f3d5d47d9bea3049c282a67e.tar.gz
Revert "tf700t: fix usb storage and dock sdreader"
This reverts commit aac79ca5d69590dd5c1a9be50b82bc2dc31b325c
-rw-r--r--overlay/frameworks/base/core/res/res/xml/storage_list.xml13
-rw-r--r--prebuilt/vold.fstab9
-rw-r--r--ramdisk/init.cardhu.rc6
3 files changed, 22 insertions, 6 deletions
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 293e19c..c64a23d 100644
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -41,13 +41,22 @@
android:primary="true"
android:emulated="true"
android:mtpReserve="100" />
- <!-- Dock SD Card -->
+ <!-- Micro SD card -->
<storage android:mountPoint="/storage/sdcard1"
+ android:storageDescription="@string/storage_sd_card"
+ android:removable="true"
+ android:maxFileSize="4096" />
+ <!-- Dock SD Card -->
+ <storage android:mountPoint="/storage/sdcard2"
android:storageDescription="@string/storage_sd_dock_card"
android:removable="true"
android:maxFileSize="4096" />
<!-- external USB drive -->
- <storage android:mountPoint="/storage/usbdisk"
+ <storage android:mountPoint="/storage/usbdisk0"
+ android:storageDescription="@string/storage_usb"
+ android:removable="true" />
+ <!-- external USB drive -->
+ <storage android:mountPoint="/storage/usbdisk1"
android:storageDescription="@string/storage_usb"
android:removable="true" />
</StorageList>
diff --git a/prebuilt/vold.fstab b/prebuilt/vold.fstab
index 38fa99d..246c2fc 100644
--- a/prebuilt/vold.fstab
+++ b/prebuilt/vold.fstab
@@ -10,5 +10,10 @@
## <sysfs_path> - List of sysfs paths to source devices
######################
-dev_mount usbdisk /storage/usbdisk auto /devices/platform/tegra-ehci.2/usb1/1-1/1-1.2 /devices/platform/tegra-ehci.2/usb2/2-1/2-1.2
-dev_mount sdreader /storage/sdcard1 auto /devices/platform/tegra-ehci.2/usb1/1-1/1-1.3 /devices/platform/tegra-ehci.2/usb2/2-1/2-1.3
+# Mounts the first usable partition of the specified device
+dev_mount microsd /storage/sdcard1 auto /devices/platform/sdhci-tegra.0/mmc_host/mmc2
+dev_mount usbdisk1 /storage/usbdisk0 auto /devices/platform/tegra-ehci.2/usb1/1-1/1-1.2 /devices/platform/tegra-ehci.2/usb2/2-1/2-1.2
+
+dev_mount usbdisk2 /storage/usbdisk1 auto /devices/platform/tegra-ehci.2/usb1/1-1/1-1.1 /devices/platform/tegra-ehci.2/usb2/2-1/2-1.1 /devices/platform/tegra-ehci.2/usb2/2-1/2-1:1 /devices/platform/tegra-ehci.2/usb1/1-1/1-1:1
+
+dev_mount sdreader /storage/sdcard2 auto /devices/platform/tegra-ehci.2/usb1/1-1/1-1.3 /devices/platform/tegra-ehci.2/usb2/2-1/2-1.3
diff --git a/ramdisk/init.cardhu.rc b/ramdisk/init.cardhu.rc
index 94e8902..62b0d27 100644
--- a/ramdisk/init.cardhu.rc
+++ b/ramdisk/init.cardhu.rc
@@ -6,6 +6,7 @@ on early-init
# for backwards compatibility
export EXTERNAL_STORAGE /storage/sdcard0
+ export SECONDARY_STORAGE /storage/sdcard1
mkdir /storage 0550 system sdcard_r
mkdir /storage/sdcard0 0000 system system
symlink /storage/sdcard0 /sdcard
@@ -13,8 +14,9 @@ on early-init
# make the pathes for the external media mounts
mkdir /storage/sdcard1 0000 system system
- mkdir /storage/usbdisk 0000 system system
- symlink /storage/usbdisk /mnt/usbdisk
+ mkdir /storage/sdcard2 0000 system system
+ mkdir /storage/usbdisk0 0000 system system
+ mkdir /storage/usbdisk1 0000 system system
on fs
mount ext4 /dev/block/mmcblk0p1 /system wait rw