summaryrefslogtreecommitdiffstats
path: root/firmware/export
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-10-18 10:16:27 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-10-18 10:19:42 -0400
commit6a94f1e995fee94c792a4bef2fd0bce1974ede7b (patch)
tree3170ecaf1f30cd608082099806a06752bdf55cd6 /firmware/export
parent5f75c493e3bebc53f951b72acdf552b8a2aeb4ae (diff)
downloadrockbox-6a94f1e995fee94c792a4bef2fd0bce1974ede7b.tar.gz
rockbox-6a94f1e995fee94c792a4bef2fd0bce1974ede7b.zip
sonynwz: Properly support multidrive, with hotswap of the SD card
Change-Id: I7eb8efb0986a395d5ffbcc06a54bb680e0b59e9d
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/config/samsungypr0.h1
-rw-r--r--firmware/export/config/sonynwa20.h2
-rw-r--r--firmware/export/config/sonynwza10.h2
-rw-r--r--firmware/export/config/sonynwzlinux.h13
4 files changed, 15 insertions, 3 deletions
diff --git a/firmware/export/config/samsungypr0.h b/firmware/export/config/samsungypr0.h
index 286299bf81..29c565c525 100644
--- a/firmware/export/config/samsungypr0.h
+++ b/firmware/export/config/samsungypr0.h
@@ -169,3 +169,4 @@
#define HAVE_HOTSWAP
#define HAVE_STORAGE_FLUSH
#define MULTIDRIVE_DIR "/mnt/mmc"
+#define MULTIDRIVE_DEV "/sys/block/mmcblk0"
diff --git a/firmware/export/config/sonynwa20.h b/firmware/export/config/sonynwa20.h
index d9f6292459..e5380114b7 100644
--- a/firmware/export/config/sonynwa20.h
+++ b/firmware/export/config/sonynwa20.h
@@ -13,4 +13,6 @@
/* sqrt(240^2 + 320^2) / 2 = 200 */
#define LCD_DPI 200
+#define NWZ_HAS_SD
+
#include "sonynwzlinux.h"
diff --git a/firmware/export/config/sonynwza10.h b/firmware/export/config/sonynwza10.h
index a0650cf22d..750a4d59d7 100644
--- a/firmware/export/config/sonynwza10.h
+++ b/firmware/export/config/sonynwza10.h
@@ -13,4 +13,6 @@
/* sqrt(240^2 + 320^2) / 2 = 200 */
#define LCD_DPI 200
+#define NWZ_HAS_SD
+
#include "sonynwzlinux.h"
diff --git a/firmware/export/config/sonynwzlinux.h b/firmware/export/config/sonynwzlinux.h
index 074ad1c417..71affd1584 100644
--- a/firmware/export/config/sonynwzlinux.h
+++ b/firmware/export/config/sonynwzlinux.h
@@ -57,9 +57,6 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x100000
-
-
-
#define CONFIG_TUNER SI4700
/* There is no hardware tone control */
@@ -105,8 +102,18 @@
/* Define this to the CPU frequency */
#define CPU_FREQ 532000000
+#ifdef NWZ_HAS_SD
+/* External SD card can be mounted */
+#define CONFIG_STORAGE (STORAGE_HOSTFS|STORAGE_SD)
+#define HAVE_MULTIDRIVE /* But _not_ CONFIG_STORAGE_MULTI */
+#define NUM_DRIVES 2
+#define HAVE_HOTSWAP
+#define MULTIDRIVE_DIR "/mnt/media"
+#define MULTIDRIVE_DEV "/sys/block/mmcblk1"
+#else
/* No special storage */
#define CONFIG_STORAGE STORAGE_HOSTFS
+#endif
#define HAVE_STORAGE_FLUSH
/* Battery */