devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

More red fixes:

Browse source 
* hostfs_removeable()/present() needed IF_MDVOID() in their prototypes
 * SIM_EXT_INSERTED/EXTRACTED are gated by HAVE_HOTSWAP

Change-Id: Id8c688f3538db99586a4f5062c83466374451883
This commit is contained in:
Solomon Peachy 2024-07-07 15:33:57 -04:00
parent 5a2bd580cd
commit 60c3fdbc11
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/export/hostfs.h
View file

@ -37,8 +37,8 @@ extern int hostfs_init(void);
extern int hostfs_flush(void); extern int hostfs_flush(void);
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
extern bool hostfs_removable(int drive); extern bool hostfs_removable(IF_MD_NONVOID(int drive));
extern bool hostfs_present(int drive); extern bool hostfs_present(IF_MD_NONVOID(int drive));
#endif #endif
/* This has to be repeated here for now for sim's sake since HAVE_HOSTFS /* This has to be repeated here for now for sim's sake since HAVE_HOSTFS

6
firmware/export/storage.h
View file

@ -227,7 +227,7 @@ static inline void storage_sleep(void) {};
#define storage_last_disk_activity() mmc_last_disk_activity() #define storage_last_disk_activity() mmc_last_disk_activity()
#define storage_spinup_time() 0 #define storage_spinup_time() 0
#define storage_get_identify() mmc_get_identify() #define storage_get_identify() mmc_get_identify()
#ifdef STORAGE_GET_INFO #ifdef STORAGE_GET_INFO
#define storage_get_info(drive, info) mmc_get_info(IF_MD(drive,) info) #define storage_get_info(drive, info) mmc_get_info(IF_MD(drive,) info)
#endif #endif
@ -251,7 +251,7 @@ static inline void storage_sleep(void) {};
#define storage_last_disk_activity() nand_last_disk_activity() #define storage_last_disk_activity() nand_last_disk_activity()
#define storage_spinup_time() 0 #define storage_spinup_time() 0
#define storage_get_identify() nand_get_identify() #define storage_get_identify() nand_get_identify()
#ifdef STORAGE_GET_INFO #ifdef STORAGE_GET_INFO
#define storage_get_info(drive, info) nand_get_info(IF_MD(drive,) info) #define storage_get_info(drive, info) nand_get_info(IF_MD(drive,) info)
#endif #endif
@ -275,7 +275,7 @@ static inline void storage_sleep(void) {};
#define storage_last_disk_activity() ramdisk_last_disk_activity() #define storage_last_disk_activity() ramdisk_last_disk_activity()
#define storage_spinup_time() 0 #define storage_spinup_time() 0
#define storage_get_identify() ramdisk_get_identify() #define storage_get_identify() ramdisk_get_identify()
#ifdef STORAGE_GET_INFO #ifdef STORAGE_GET_INFO
#define storage_get_info(drive, info) ramdisk_get_info(IF_MD(drive,) info) #define storage_get_info(drive, info) ramdisk_get_info(IF_MD(drive,) info)
#endif #endif

2
uisimulator/common/sim_tasks.c
View file

@ -45,7 +45,7 @@ enum {
SIM_SCREENDUMP, SIM_SCREENDUMP,
SIM_USB_INSERTED, SIM_USB_INSERTED,
SIM_USB_EXTRACTED, SIM_USB_EXTRACTED,
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_HOTSWAP
SIM_EXT_INSERTED, SIM_EXT_INSERTED,
SIM_EXT_EXTRACTED, SIM_EXT_EXTRACTED,
#endif #endif