len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hopefully fix the last of the stragglers.

Browse source 
* xDuoo X3 fix some warnings due to an incorrect #ifdef
 * stub storage_removeable() and storage_present() for non-HOTSWAP builds
 * sim_trigger_external() is gated by HOTSWAP, not MULTIDRIVE

Change-Id: I38f14fdfeba13957899c378051d49afc2e8245e5
This commit is contained in:
Solomon Peachy 2024-07-07 15:01:02 -04:00
parent 1528b44349
commit 5a2bd580cd
5 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
firmware/export/storage.h
View file

@ -310,6 +310,9 @@ void storage_get_info(int drive, struct storage_info *info);
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
bool storage_removable(int drive); bool storage_removable(int drive);
bool storage_present(int drive); bool storage_present(int drive);
#else
#define storage_removable(x) 0
#define storage_present(x) 1
#endif #endif
int storage_driver_type(int drive); int storage_driver_type(int drive);

2
firmware/target/hosted/sdl/button-sdl.c
View file

@ -340,7 +340,7 @@ static void button_event(int key, bool pressed)
} }
return; return;
#endif #endif
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_HOTSWAP
case EXT_KEY: case EXT_KEY:
if (!pressed) if (!pressed)
sim_trigger_external(!storage_present(1)); sim_trigger_external(!storage_present(1));

6
firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c
View file

@ -565,7 +565,7 @@ static inline int write_sector(unsigned long start, unsigned int count,
int nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) int nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf)
{ {
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIDRIVE
(void)drive; (void)drive;
#endif #endif
int ret = 0; int ret = 0;
@ -592,7 +592,7 @@ int nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* bu
int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf) int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf)
{ {
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIDRIVE
(void)drive; (void)drive;
#endif #endif
int ret = 0; int ret = 0;
@ -664,7 +664,7 @@ void nand_sleepnow(void)
#ifdef STORAGE_GET_INFO #ifdef STORAGE_GET_INFO
void nand_get_info(IF_MD(int drive,) struct storage_info *info) void nand_get_info(IF_MD(int drive,) struct storage_info *info)
{ {
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIDRIVE
(void)drive; (void)drive;
#endif #endif

2
uisimulator/common/sim_tasks.c
View file

@ -222,7 +222,7 @@ void usb_wait_for_disconnect(struct event_queue *q)
static bool is_ext_inserted; static bool is_ext_inserted;
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_HOTSWAP
void sim_trigger_external(bool inserted) void sim_trigger_external(bool inserted)
{ {
is_ext_inserted = inserted; is_ext_inserted = inserted;

2
uisimulator/common/sim_tasks.h
View file

@ -28,7 +28,9 @@
void sim_tasks_init(void); void sim_tasks_init(void);
void sim_trigger_screendump(void); void sim_trigger_screendump(void);
void sim_trigger_usb(bool inserted); void sim_trigger_usb(bool inserted);
#ifdef HAVE_HOTSWAP
void sim_trigger_external(bool inserted); void sim_trigger_external(bool inserted);
#endif
void sim_trigger_hp(bool inserted); void sim_trigger_hp(bool inserted);
void sim_trigger_lo(bool inserted); void sim_trigger_lo(bool inserted);
#endif #endif