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

Fix the remaining red in red from ea80d1cc9ca

Browse source 
Notably:

  * double-paste in ihifi760 config.h
  * jz4740 ATA & SD drivers used MULTIVOLUME instead of MULTIDRIVE
  * Simulators implicitly rely on HAVE_HOTSWAP

Change-Id: I44fc7f98f0f6df366f016567c330f87e9f3ca6a6
This commit is contained in:
Solomon Peachy 2024-07-07 12:28:05 -04:00
parent 181fe7530a
commit f37b5a8349
4 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/config/ihifi760.h
View file

@ -49,7 +49,7 @@
#define HAVE_FLASH_STORAGE #define HAVE_FLASH_STORAGE
#define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND) #define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
#define NUM_DRIVES 1 /* NAND doesn't work yet */#define NUM_DRIVES 1 /* NAND doesn't work yet */ #define NUM_DRIVES 1 /* NAND doesn't work yet */
#define CONFIG_NAND NAND_RK27XX #define CONFIG_NAND NAND_RK27XX
#define HAVE_SW_TONE_CONTROLS #define HAVE_SW_TONE_CONTROLS

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

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

12
firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
View file

@ -627,9 +627,9 @@ static inline int read_sector(unsigned long start, unsigned int count,
return ret; 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 #ifdef HAVE_MULTIDRIVE
(void)drive; (void)drive;
#endif #endif
int ret = 0; int ret = 0;
@ -670,12 +670,12 @@ int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* bu
} }
/* TODO */ /* TODO */
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)
{ {
(void)start; (void)start;
(void)count; (void)count;
(void)buf; (void)buf;
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIDRIVE
(void)drive; (void)drive;
#endif #endif
@ -727,9 +727,9 @@ void nand_sleepnow(void)
} }
#ifdef STORAGE_GET_INFO #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 #ifdef HAVE_MULTIDRIVE
(void)drive; (void)drive;
#endif #endif

10
firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
View file

@ -1252,7 +1252,7 @@ static inline void sd_stop_transfer(void)
int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) int sd_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
sd_start_transfer(); sd_start_transfer();
@ -1304,9 +1304,9 @@ err:
return retval; return retval;
} }
int sd_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf) int sd_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
sd_start_transfer(); sd_start_transfer();
@ -1387,7 +1387,7 @@ int sd_soft_reset(void)
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
bool sd_removable(IF_MD_NONVOID(int drive)) bool sd_removable(IF_MD_NONVOID(int drive))
{ {
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIDRIVE
(void)drive; (void)drive;
#endif #endif
return true; return true;
@ -1415,7 +1415,7 @@ void MMC_CD_IRQ(void)
} }
#endif #endif
bool sd_present(IF_MV_NONVOID(int drive)) bool sd_present(IF_MD_NONVOID(int drive))
{ {
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE
(void)drive; (void)drive;