summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2019-07-31 11:07:43 -0400
committerSolomon Peachy <pizza@shaftnet.org>2019-07-31 17:22:58 +0200
commit349e111c81abd2214859f1afc4b2e96fb3a90733 (patch)
tree02478ee170fed64d548bc4cae7b764f35d9e9cf8
parentf2fd8fe79b24de0223987dce4b60fc8896dab1fa (diff)
downloadrockbox-349e111.tar.gz
rockbox-349e111.tar.bz2
rockbox-349e111.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.h1
-rw-r--r--firmware/export/config/creativezenxfi.h1
-rw-r--r--firmware/export/config/creativezenxfi2.h1
-rw-r--r--firmware/export/config/creativezenxfi3.h1
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 @@
#define CONFIG_STORAGE STORAGE_SD
#define NUM_DRIVES 2
#define HAVE_MULTIDRIVE
+#define HAVE_MULTIVOLUME
#define HAVE_HOTSWAP
/* 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 @@
#define CONFIG_STORAGE STORAGE_SD
#define NUM_DRIVES 2
#define HAVE_MULTIDRIVE
+#define HAVE_MULTIVOLUME
#define HAVE_HOTSWAP
/* 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 @@
#define CONFIG_STORAGE (/*STORAGE_NAND |*/ STORAGE_SD)
#define NUM_DRIVES 2
#define HAVE_MULTIDRIVE
+#define HAVE_MULTIVOLUME
#define HAVE_HOTSWAP_STORAGE_AS_MAIN
#define HAVE_HOTSWAP
#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 @@
#define CONFIG_STORAGE STORAGE_SD
#define NUM_DRIVES 2
#define HAVE_MULTIDRIVE
+#define HAVE_MULTIVOLUME
#define HAVE_HOTSWAP
/* Extra threads: touchpad */