diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2024-07-07 12:28:05 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2024-07-07 12:29:19 -0400 |
commit | f37b5a834967eb273c14d532de43bf31ccb51c3a (patch) | |
tree | 93b0610f4f362b05f98d46f8457dd05383c59630 /firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | |
parent | 181fe7530a6b45568167a0d539f6806c62338165 (diff) | |
download | rockbox-f37b5a834967eb273c14d532de43bf31ccb51c3a.tar.gz rockbox-f37b5a834967eb273c14d532de43bf31ccb51c3a.zip |
Fix the remaining red in red from ea80d1cc9ca
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
Diffstat (limited to 'firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c')
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c index 56dd50814a..ce8a3d7479 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | |||
@@ -1252,7 +1252,7 @@ static inline void sd_stop_transfer(void) | |||
1252 | 1252 | ||
1253 | int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) | 1253 | int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) |
1254 | { | 1254 | { |
1255 | #ifdef HAVE_MULTIVOLUME | 1255 | #ifdef HAVE_MULTIDRIVE |
1256 | (void)drive; | 1256 | (void)drive; |
1257 | #endif | 1257 | #endif |
1258 | sd_start_transfer(); | 1258 | sd_start_transfer(); |
@@ -1304,9 +1304,9 @@ err: | |||
1304 | return retval; | 1304 | return retval; |
1305 | } | 1305 | } |
1306 | 1306 | ||
1307 | int sd_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf) | 1307 | int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf) |
1308 | { | 1308 | { |
1309 | #ifdef HAVE_MULTIVOLUME | 1309 | #ifdef HAVE_MULTIDRIVE |
1310 | (void)drive; | 1310 | (void)drive; |
1311 | #endif | 1311 | #endif |
1312 | sd_start_transfer(); | 1312 | sd_start_transfer(); |
@@ -1387,7 +1387,7 @@ int sd_soft_reset(void) | |||
1387 | #ifdef HAVE_HOTSWAP | 1387 | #ifdef HAVE_HOTSWAP |
1388 | bool sd_removable(IF_MD_NONVOID(int drive)) | 1388 | bool sd_removable(IF_MD_NONVOID(int drive)) |
1389 | { | 1389 | { |
1390 | #ifdef HAVE_MULTIVOLUME | 1390 | #ifdef HAVE_MULTIDRIVE |
1391 | (void)drive; | 1391 | (void)drive; |
1392 | #endif | 1392 | #endif |
1393 | return true; | 1393 | return true; |
@@ -1415,7 +1415,7 @@ void MMC_CD_IRQ(void) | |||
1415 | } | 1415 | } |
1416 | #endif | 1416 | #endif |
1417 | 1417 | ||
1418 | bool sd_present(IF_MV_NONVOID(int drive)) | 1418 | bool sd_present(IF_MD_NONVOID(int drive)) |
1419 | { | 1419 | { |
1420 | #ifdef HAVE_MULTIDRIVE | 1420 | #ifdef HAVE_MULTIDRIVE |
1421 | (void)drive; | 1421 | (void)drive; |