diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2024-07-07 15:33:57 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2024-07-07 15:40:27 -0400 |
commit | 60c3fdbc11e990f34c2181214eede37679b29907 (patch) | |
tree | 63829d924110f0afd79765fae1da91c78c9169ee | |
parent | 5a2bd580cdd3d83daef3e5c0da1cf0b0236f1d05 (diff) | |
download | rockbox-60c3fdbc11.tar.gz rockbox-60c3fdbc11.zip |
More red fixes:
* hostfs_removeable()/present() needed IF_MDVOID() in their prototypes
* SIM_EXT_INSERTED/EXTRACTED are gated by HAVE_HOTSWAP
Change-Id: Id8c688f3538db99586a4f5062c83466374451883
-rw-r--r-- | firmware/export/hostfs.h | 4 | ||||
-rw-r--r-- | firmware/export/storage.h | 6 | ||||
-rw-r--r-- | uisimulator/common/sim_tasks.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/firmware/export/hostfs.h b/firmware/export/hostfs.h index c0fe85236e..c59868110a 100644 --- a/firmware/export/hostfs.h +++ b/firmware/export/hostfs.h @@ -37,8 +37,8 @@ extern int hostfs_init(void); extern int hostfs_flush(void); #ifdef HAVE_HOTSWAP -extern bool hostfs_removable(int drive); -extern bool hostfs_present(int drive); +extern bool hostfs_removable(IF_MD_NONVOID(int drive)); +extern bool hostfs_present(IF_MD_NONVOID(int drive)); #endif /* This has to be repeated here for now for sim's sake since HAVE_HOSTFS diff --git a/firmware/export/storage.h b/firmware/export/storage.h index b87b7d001f..b72cccc257 100644 --- a/firmware/export/storage.h +++ b/firmware/export/storage.h @@ -227,7 +227,7 @@ static inline void storage_sleep(void) {}; #define storage_last_disk_activity() mmc_last_disk_activity() #define storage_spinup_time() 0 #define storage_get_identify() mmc_get_identify() - + #ifdef STORAGE_GET_INFO #define storage_get_info(drive, info) mmc_get_info(IF_MD(drive,) info) #endif @@ -251,7 +251,7 @@ static inline void storage_sleep(void) {}; #define storage_last_disk_activity() nand_last_disk_activity() #define storage_spinup_time() 0 #define storage_get_identify() nand_get_identify() - + #ifdef STORAGE_GET_INFO #define storage_get_info(drive, info) nand_get_info(IF_MD(drive,) info) #endif @@ -275,7 +275,7 @@ static inline void storage_sleep(void) {}; #define storage_last_disk_activity() ramdisk_last_disk_activity() #define storage_spinup_time() 0 #define storage_get_identify() ramdisk_get_identify() - + #ifdef STORAGE_GET_INFO #define storage_get_info(drive, info) ramdisk_get_info(IF_MD(drive,) info) #endif diff --git a/uisimulator/common/sim_tasks.c b/uisimulator/common/sim_tasks.c index 6662b28767..ef67fd24ee 100644 --- a/uisimulator/common/sim_tasks.c +++ b/uisimulator/common/sim_tasks.c @@ -45,7 +45,7 @@ enum { SIM_SCREENDUMP, SIM_USB_INSERTED, SIM_USB_EXTRACTED, -#ifdef HAVE_MULTIDRIVE +#ifdef HAVE_HOTSWAP SIM_EXT_INSERTED, SIM_EXT_EXTRACTED, #endif |