len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

hosted: Support hot-swappable internal and external storage

Browse source 
Change-Id: I321e9da4d5087dbd91194e6faa35cd4a685a0495
This commit is contained in:
Solomon Peachy 2020-10-17 17:21:34 -04:00
parent d8d37ffdb8
commit f3ec58c05b
2 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
firmware/target/hosted/fiio/system-fiio.c
View file

@ -23,6 +23,8 @@
#include <string.h> #include <string.h>
#include <ucontext.h> #include <ucontext.h>
#include <backtrace.h> #include <backtrace.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include "system.h" #include "system.h"
#include "mv.h" #include "mv.h"
@ -31,10 +33,12 @@
#include "button.h" #include "button.h"
#include "backlight-target.h" #include "backlight-target.h"
#include "lcd.h" #include "lcd.h"
#include "panic.h" #include "panic.h"
#include <fcntl.h>
#include <sys/ioctl.h> #include "filesystem-hosted.h"
/* forward-declare */
bool os_file_exists(const char *ospath);
/* to make thread-internal.h happy */ /* to make thread-internal.h happy */
uintptr_t *stackbegin; uintptr_t *stackbegin;
@ -102,7 +106,7 @@ void power_off(void)
{ {
panicf("Call AXP173_SHUTDOWN fail"); panicf("Call AXP173_SHUTDOWN fail");
} }
close(axp_hw); close(axp_hw);
} }
@ -151,17 +155,29 @@ bool hostfs_removable(IF_MD_NONVOID(int drive))
return true; return true;
else else
#endif #endif
#ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN
return true;
#else
return false; /* internal: always present */ return false; /* internal: always present */
#endif
} }
bool hostfs_present(IF_MD_NONVOID(int drive)) bool hostfs_present(IF_MD_NONVOID(int drive))
{ {
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE
if (drive > 0) /* Active LOW */ if (drive > 0) /* Active LOW */
return true; //FIXME #if defined(MULTIDRIVE_DEV)
return os_file_exists(MULTIDRIVE_DEV);
#else
return true;
#endif
else else
#endif #endif
#ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN
return os_file_exists(ROOTDRIVE_DEV);
#else
return true; /* internal: always present */ return true; /* internal: always present */
#endif
} }
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE
@ -206,4 +222,3 @@ bool volume_present(int volume)
return hostfs_present(volume); return hostfs_present(volume);
} }
#endif #endif

20
firmware/target/hosted/system-hosted.c
View file

@ -31,11 +31,15 @@
#include "button.h" #include "button.h"
#include "backlight-target.h" #include "backlight-target.h"
#include "lcd.h" #include "lcd.h"
#include "filesystem-hosted.h"
/* to make thread-internal.h happy */ /* to make thread-internal.h happy */
uintptr_t *stackbegin; uintptr_t *stackbegin;
uintptr_t *stackend; uintptr_t *stackend;
/* forward-declare */
bool os_file_exists(const char *ospath);
static void sig_handler(int sig, siginfo_t *siginfo, void *context) static void sig_handler(int sig, siginfo_t *siginfo, void *context)
{ {
/* safe guard variable - we call backtrace() only on first /* safe guard variable - we call backtrace() only on first
@ -134,17 +138,29 @@ bool hostfs_removable(IF_MD_NONVOID(int drive))
return true; return true;
else else
#endif #endif
#ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN
return true;
#else
return false; /* internal: always present */ return false; /* internal: always present */
#endif
} }
bool hostfs_present(IF_MD_NONVOID(int drive)) bool hostfs_present(IF_MD_NONVOID(int drive))
{ {
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE
if (drive > 0) /* Active LOW */ if (drive > 0)
return true; //FIXME #if defined(MULTIDRIVE_DEV)
return os_file_exists(MULTIDRIVE_DEV);
#else
return true; // FIXME?
#endif
else else
#endif #endif
#ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN
return os_file_exists(ROOTDRIVE_DEV);
#else
return true; /* internal: always present */ return true; /* internal: always present */
#endif
} }
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE