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

More red fixes

Browse source 
Change-Id: If22cdb286edac47b08b158bee6910ba7a539b041
This commit is contained in:
Solomon Peachy 2024-07-07 14:36:55 -04:00
parent 520875ff00
commit 1528b44349
5 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/config.h
View file

@ -893,7 +893,7 @@ Lyre prototype 1 */
#endif
/* Bootloaders don't need multivolume awareness */
#if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME)
#if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME) && !(CONFIG_PLATFORM & PLATFORM_HOSTED)
#undef HAVE_MULTIVOLUME
#endif

5
firmware/export/config/sim.h
View file

@ -25,11 +25,6 @@
#undef AMS_OF_SIZE
/* Simulator core requires hotswap */
#ifndef HAVE_HOTSWAP
#define HAVE_HOTSWAP
#endif
#undef HAVE_HOTSWAP_STORAGE_AS_MAIN
#undef HAVE_STORAGE_FLUSH

3
firmware/export/mv.h
View file

@ -120,6 +120,9 @@ bool volume_ismounted(IF_MV_NONVOID(int volume));
#ifdef HAVE_HOTSWAP
bool volume_removable(int volume);
bool volume_present(int volume);
#else
#define volume_present(x) 1
#define volueme_removeable(x) 0
#endif /* HAVE_HOTSWAP */
#ifdef HAVE_MULTIDRIVE

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

@ -563,7 +563,7 @@ static inline int write_sector(unsigned long start, unsigned int count,
return ret;
}
int nand_read_sectors(IF_MV(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
(void)drive;
@ -590,7 +590,7 @@ int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* bu
return ret;
}
int nand_write_sectors(IF_MV(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
(void)drive;
@ -662,7 +662,7 @@ void nand_sleepnow(void)
}
#ifdef STORAGE_GET_INFO
void nand_get_info(IF_MV(int drive,) struct storage_info *info)
void nand_get_info(IF_MD(int drive,) struct storage_info *info)
{
#ifdef HAVE_MULTIVOLUME
(void)drive;

2
uisimulator/common/filesystem-sim.c
View file

@ -691,7 +691,7 @@ struct sim_dirent * sim_readdir(DIR *dirp)
if (readdir_volume(dirstr, entry))
return entry;
OS_DIRENT_T *osdirent = os_readdir(dirstr->osdirp);
if (!osdirent)
return NULL;