diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-18 10:16:27 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-18 10:19:42 -0400 |
commit | 6a94f1e995fee94c792a4bef2fd0bce1974ede7b (patch) | |
tree | 3170ecaf1f30cd608082099806a06752bdf55cd6 /firmware/export | |
parent | 5f75c493e3bebc53f951b72acdf552b8a2aeb4ae (diff) | |
download | rockbox-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.h | 1 | ||||
-rw-r--r-- | firmware/export/config/sonynwa20.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sonynwza10.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sonynwzlinux.h | 13 |
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 @@ | |||
169 | #define HAVE_HOTSWAP | 169 | #define HAVE_HOTSWAP |
170 | #define HAVE_STORAGE_FLUSH | 170 | #define HAVE_STORAGE_FLUSH |
171 | #define MULTIDRIVE_DIR "/mnt/mmc" | 171 | #define MULTIDRIVE_DIR "/mnt/mmc" |
172 | #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 @@ | |||
13 | /* sqrt(240^2 + 320^2) / 2 = 200 */ | 13 | /* sqrt(240^2 + 320^2) / 2 = 200 */ |
14 | #define LCD_DPI 200 | 14 | #define LCD_DPI 200 |
15 | 15 | ||
16 | #define NWZ_HAS_SD | ||
17 | |||
16 | #include "sonynwzlinux.h" | 18 | #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 @@ | |||
13 | /* sqrt(240^2 + 320^2) / 2 = 200 */ | 13 | /* sqrt(240^2 + 320^2) / 2 = 200 */ |
14 | #define LCD_DPI 200 | 14 | #define LCD_DPI 200 |
15 | 15 | ||
16 | #define NWZ_HAS_SD | ||
17 | |||
16 | #include "sonynwzlinux.h" | 18 | #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 @@ | |||
57 | /* The number of bytes reserved for loadable plugins */ | 57 | /* The number of bytes reserved for loadable plugins */ |
58 | #define PLUGIN_BUFFER_SIZE 0x100000 | 58 | #define PLUGIN_BUFFER_SIZE 0x100000 |
59 | 59 | ||
60 | |||
61 | |||
62 | |||
63 | #define CONFIG_TUNER SI4700 | 60 | #define CONFIG_TUNER SI4700 |
64 | 61 | ||
65 | /* There is no hardware tone control */ | 62 | /* There is no hardware tone control */ |
@@ -105,8 +102,18 @@ | |||
105 | /* Define this to the CPU frequency */ | 102 | /* Define this to the CPU frequency */ |
106 | #define CPU_FREQ 532000000 | 103 | #define CPU_FREQ 532000000 |
107 | 104 | ||
105 | #ifdef NWZ_HAS_SD | ||
106 | /* External SD card can be mounted */ | ||
107 | #define CONFIG_STORAGE (STORAGE_HOSTFS|STORAGE_SD) | ||
108 | #define HAVE_MULTIDRIVE /* But _not_ CONFIG_STORAGE_MULTI */ | ||
109 | #define NUM_DRIVES 2 | ||
110 | #define HAVE_HOTSWAP | ||
111 | #define MULTIDRIVE_DIR "/mnt/media" | ||
112 | #define MULTIDRIVE_DEV "/sys/block/mmcblk1" | ||
113 | #else | ||
108 | /* No special storage */ | 114 | /* No special storage */ |
109 | #define CONFIG_STORAGE STORAGE_HOSTFS | 115 | #define CONFIG_STORAGE STORAGE_HOSTFS |
116 | #endif | ||
110 | #define HAVE_STORAGE_FLUSH | 117 | #define HAVE_STORAGE_FLUSH |
111 | 118 | ||
112 | /* Battery */ | 119 | /* Battery */ |