diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2019-07-31 11:07:43 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2019-07-31 17:22:58 +0200 |
commit | 349e111c81abd2214859f1afc4b2e96fb3a90733 (patch) | |
tree | 02478ee170fed64d548bc4cae7b764f35d9e9cf8 | |
parent | f2fd8fe79b24de0223987dce4b60fc8896dab1fa (diff) | |
download | rockbox-349e111c81abd2214859f1afc4b2e96fb3a90733.tar.gz rockbox-349e111c81abd2214859f1afc4b2e96fb3a90733.zip |
Revert "cleanup: Remove HAVE_MULTIVOLUME from targets with HAVE_MULTIDRIVE"
This reverts commit a89bf68e889dd989e486b0a131618f69e5fc26c6.
HAVE_MULTIVOLUME && HAVE_MULTIDRIVE implicitly means "allow 4 volumes
per drive" whereas the normal MULTIDRIVE behavior is to only allow 1
volume per drive.
-rw-r--r-- | firmware/export/config/creativezen.h | 1 | ||||
-rw-r--r-- | firmware/export/config/creativezenxfi.h | 1 | ||||
-rw-r--r-- | firmware/export/config/creativezenxfi2.h | 1 | ||||
-rw-r--r-- | firmware/export/config/creativezenxfi3.h | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h index 81f594f76f..0033b7d4eb 100644 --- a/firmware/export/config/creativezen.h +++ b/firmware/export/config/creativezen.h | |||
@@ -133,6 +133,7 @@ | |||
133 | #define CONFIG_STORAGE STORAGE_SD | 133 | #define CONFIG_STORAGE STORAGE_SD |
134 | #define NUM_DRIVES 2 | 134 | #define NUM_DRIVES 2 |
135 | #define HAVE_MULTIDRIVE | 135 | #define HAVE_MULTIDRIVE |
136 | #define HAVE_MULTIVOLUME | ||
136 | #define HAVE_HOTSWAP | 137 | #define HAVE_HOTSWAP |
137 | 138 | ||
138 | /* todo */ | 139 | /* todo */ |
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h index fbe114d5c7..35bd1efdfb 100644 --- a/firmware/export/config/creativezenxfi.h +++ b/firmware/export/config/creativezenxfi.h | |||
@@ -138,6 +138,7 @@ | |||
138 | #define CONFIG_STORAGE STORAGE_SD | 138 | #define CONFIG_STORAGE STORAGE_SD |
139 | #define NUM_DRIVES 2 | 139 | #define NUM_DRIVES 2 |
140 | #define HAVE_MULTIDRIVE | 140 | #define HAVE_MULTIDRIVE |
141 | #define HAVE_MULTIVOLUME | ||
141 | #define HAVE_HOTSWAP | 142 | #define HAVE_HOTSWAP |
142 | 143 | ||
143 | /* todo */ | 144 | /* todo */ |
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h index 9fff106e26..3945311e29 100644 --- a/firmware/export/config/creativezenxfi2.h +++ b/firmware/export/config/creativezenxfi2.h | |||
@@ -140,6 +140,7 @@ | |||
140 | #define CONFIG_STORAGE (/*STORAGE_NAND |*/ STORAGE_SD) | 140 | #define CONFIG_STORAGE (/*STORAGE_NAND |*/ STORAGE_SD) |
141 | #define NUM_DRIVES 2 | 141 | #define NUM_DRIVES 2 |
142 | #define HAVE_MULTIDRIVE | 142 | #define HAVE_MULTIDRIVE |
143 | #define HAVE_MULTIVOLUME | ||
143 | #define HAVE_HOTSWAP_STORAGE_AS_MAIN | 144 | #define HAVE_HOTSWAP_STORAGE_AS_MAIN |
144 | #define HAVE_HOTSWAP | 145 | #define HAVE_HOTSWAP |
145 | #define CONFIG_NAND NAND_IMX233 | 146 | #define CONFIG_NAND NAND_IMX233 |
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h index 81e1e453b2..d72b41d608 100644 --- a/firmware/export/config/creativezenxfi3.h +++ b/firmware/export/config/creativezenxfi3.h | |||
@@ -144,6 +144,7 @@ | |||
144 | #define CONFIG_STORAGE STORAGE_SD | 144 | #define CONFIG_STORAGE STORAGE_SD |
145 | #define NUM_DRIVES 2 | 145 | #define NUM_DRIVES 2 |
146 | #define HAVE_MULTIDRIVE | 146 | #define HAVE_MULTIDRIVE |
147 | #define HAVE_MULTIVOLUME | ||
147 | #define HAVE_HOTSWAP | 148 | #define HAVE_HOTSWAP |
148 | 149 | ||
149 | /* Extra threads: touchpad */ | 150 | /* Extra threads: touchpad */ |