summaryrefslogtreecommitdiffstats
path: root/firmware/target
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-10-17 16:57:51 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-10-17 18:38:49 -0400
commitd8d37ffdb8bed39df5d021afa9e09bf087b45d0d (patch)
treeeaea28432d9a76c98d69470c3c8a8bd0b4e17282 /firmware/target
parent0a4a920029bfb8194c37870b7e6d8e60cd7c8ef9 (diff)
downloadrockbox-d8d37ffdb8bed39df5d021afa9e09bf087b45d0d.tar.gz
rockbox-d8d37ffdb8bed39df5d021afa9e09bf087b45d0d.zip
Define a USB storage type, and hook it up for hosted targets
Change-Id: I56363c989139c7edf0b2c67b0aac9ef1adfacba2
Diffstat (limited to 'firmware/target')
-rw-r--r--firmware/target/hosted/fiio/system-fiio.c4
-rw-r--r--firmware/target/hosted/system-hosted.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/firmware/target/hosted/fiio/system-fiio.c b/firmware/target/hosted/fiio/system-fiio.c
index f011ceea75..46a4d0f835 100644
--- a/firmware/target/hosted/fiio/system-fiio.c
+++ b/firmware/target/hosted/fiio/system-fiio.c
@@ -174,7 +174,11 @@ int volume_drive(int drive)
#ifdef CONFIG_STORAGE_MULTI
int hostfs_driver_type(int drive)
{
+#if (CONFIG_STORAGE & STORAGE_USB)
+ return drive > 0 ? STORAGE_USB_NUM : STORAGE_HOSTFS_NUM;
+#else
return drive > 0 ? STORAGE_SD_NUM : STORAGE_HOSTFS_NUM;
+#endif
}
#endif /* CONFIG_STORAGE_MULTI */
diff --git a/firmware/target/hosted/system-hosted.c b/firmware/target/hosted/system-hosted.c
index cad84ac868..f485dc4c15 100644
--- a/firmware/target/hosted/system-hosted.c
+++ b/firmware/target/hosted/system-hosted.c
@@ -130,7 +130,7 @@ void system_exception_wait(void)
bool hostfs_removable(IF_MD_NONVOID(int drive))
{
#ifdef HAVE_MULTIDRIVE
- if (drive > 0) /* Active LOW */
+ if (drive > 0)
return true;
else
#endif
@@ -157,7 +157,11 @@ int volume_drive(int drive)
#ifdef CONFIG_STORAGE_MULTI
int hostfs_driver_type(int drive)
{
+#if (CONFIG_STORAGE & STORAGE_USB)
+ return drive > 0 ? STORAGE_USB_NUM : STORAGE_HOSTFS_NUM;
+#else
return drive > 0 ? STORAGE_SD_NUM : STORAGE_HOSTFS_NUM;
+#endif
}
#endif /* CONFIG_STORAGE_MULTI */
@@ -185,4 +189,3 @@ bool volume_present(int volume)
return hostfs_present(volume);
}
#endif
-