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 | |
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
-rw-r--r-- | firmware/export/config/ihifi760.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sim.h | 5 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c | 12 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 10 |
4 files changed, 17 insertions, 12 deletions
diff --git a/firmware/export/config/ihifi760.h b/firmware/export/config/ihifi760.h index 5ba19a55c3..ca62948bd2 100644 --- a/firmware/export/config/ihifi760.h +++ b/firmware/export/config/ihifi760.h | |||
@@ -49,7 +49,7 @@ | |||
49 | #define HAVE_FLASH_STORAGE | 49 | #define HAVE_FLASH_STORAGE |
50 | 50 | ||
51 | #define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND) | 51 | #define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND) |
52 | #define NUM_DRIVES 1 /* NAND doesn't work yet */#define NUM_DRIVES 1 /* NAND doesn't work yet */ | 52 | #define NUM_DRIVES 1 /* NAND doesn't work yet */ |
53 | 53 | ||
54 | #define CONFIG_NAND NAND_RK27XX | 54 | #define CONFIG_NAND NAND_RK27XX |
55 | #define HAVE_SW_TONE_CONTROLS | 55 | #define HAVE_SW_TONE_CONTROLS |
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h index 0aeca695f0..89a0f12b6a 100644 --- a/firmware/export/config/sim.h +++ b/firmware/export/config/sim.h | |||
@@ -25,6 +25,11 @@ | |||
25 | 25 | ||
26 | #undef AMS_OF_SIZE | 26 | #undef AMS_OF_SIZE |
27 | 27 | ||
28 | /* Simulator core requires hotswap */ | ||
29 | #ifndef HAVE_HOTSWAP | ||
30 | #define HAVE_HOTSWAP | ||
31 | #endif | ||
32 | |||
28 | #undef HAVE_HOTSWAP_STORAGE_AS_MAIN | 33 | #undef HAVE_HOTSWAP_STORAGE_AS_MAIN |
29 | #undef HAVE_STORAGE_FLUSH | 34 | #undef HAVE_STORAGE_FLUSH |
30 | 35 | ||
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c index 5f320f8e9b..0c9ee98eb9 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c | |||
@@ -627,9 +627,9 @@ static inline int read_sector(unsigned long start, unsigned int count, | |||
627 | return ret; | 627 | return ret; |
628 | } | 628 | } |
629 | 629 | ||
630 | int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* buf) | 630 | int nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) |
631 | { | 631 | { |
632 | #ifdef HAVE_MULTIVOLUME | 632 | #ifdef HAVE_MULTIDRIVE |
633 | (void)drive; | 633 | (void)drive; |
634 | #endif | 634 | #endif |
635 | int ret = 0; | 635 | int ret = 0; |
@@ -670,12 +670,12 @@ int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* bu | |||
670 | } | 670 | } |
671 | 671 | ||
672 | /* TODO */ | 672 | /* TODO */ |
673 | int nand_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf) | 673 | int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf) |
674 | { | 674 | { |
675 | (void)start; | 675 | (void)start; |
676 | (void)count; | 676 | (void)count; |
677 | (void)buf; | 677 | (void)buf; |
678 | #ifdef HAVE_MULTIVOLUME | 678 | #ifdef HAVE_MULTIDRIVE |
679 | (void)drive; | 679 | (void)drive; |
680 | #endif | 680 | #endif |
681 | 681 | ||
@@ -727,9 +727,9 @@ void nand_sleepnow(void) | |||
727 | } | 727 | } |
728 | 728 | ||
729 | #ifdef STORAGE_GET_INFO | 729 | #ifdef STORAGE_GET_INFO |
730 | void nand_get_info(IF_MV(int drive,) struct storage_info *info) | 730 | void nand_get_info(IF_MD(int drive,) struct storage_info *info) |
731 | { | 731 | { |
732 | #ifdef HAVE_MULTIVOLUME | 732 | #ifdef HAVE_MULTIDRIVE |
733 | (void)drive; | 733 | (void)drive; |
734 | #endif | 734 | #endif |
735 | 735 | ||
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; |