diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2024-07-07 14:36:55 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2024-07-07 14:47:07 -0400 |
commit | 1528b44349d33495c7ea5dc7b3fcd8e07995d16e (patch) | |
tree | a4577b96e157038c0ee3d4e5160fbe5309851e06 | |
parent | 520875ff00f23f8d986e3d7dd8e2f3937e9dda7e (diff) | |
download | rockbox-1528b44349d33495c7ea5dc7b3fcd8e07995d16e.tar.gz rockbox-1528b44349d33495c7ea5dc7b3fcd8e07995d16e.zip |
More red fixes
Change-Id: If22cdb286edac47b08b158bee6910ba7a539b041
-rw-r--r-- | firmware/export/config.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sim.h | 5 | ||||
-rw-r--r-- | firmware/export/mv.h | 3 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c | 6 | ||||
-rw-r--r-- | uisimulator/common/filesystem-sim.c | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 3d94828ec3..5e5425a697 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -893,7 +893,7 @@ Lyre prototype 1 */ | |||
893 | #endif | 893 | #endif |
894 | 894 | ||
895 | /* Bootloaders don't need multivolume awareness */ | 895 | /* Bootloaders don't need multivolume awareness */ |
896 | #if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME) | 896 | #if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME) && !(CONFIG_PLATFORM & PLATFORM_HOSTED) |
897 | #undef HAVE_MULTIVOLUME | 897 | #undef HAVE_MULTIVOLUME |
898 | #endif | 898 | #endif |
899 | 899 | ||
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h index 89a0f12b6a..0aeca695f0 100644 --- a/firmware/export/config/sim.h +++ b/firmware/export/config/sim.h | |||
@@ -25,11 +25,6 @@ | |||
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 | |||
33 | #undef HAVE_HOTSWAP_STORAGE_AS_MAIN | 28 | #undef HAVE_HOTSWAP_STORAGE_AS_MAIN |
34 | #undef HAVE_STORAGE_FLUSH | 29 | #undef HAVE_STORAGE_FLUSH |
35 | 30 | ||
diff --git a/firmware/export/mv.h b/firmware/export/mv.h index 966ff9a032..1122c7b85f 100644 --- a/firmware/export/mv.h +++ b/firmware/export/mv.h | |||
@@ -120,6 +120,9 @@ bool volume_ismounted(IF_MV_NONVOID(int volume)); | |||
120 | #ifdef HAVE_HOTSWAP | 120 | #ifdef HAVE_HOTSWAP |
121 | bool volume_removable(int volume); | 121 | bool volume_removable(int volume); |
122 | bool volume_present(int volume); | 122 | bool volume_present(int volume); |
123 | #else | ||
124 | #define volume_present(x) 1 | ||
125 | #define volueme_removeable(x) 0 | ||
123 | #endif /* HAVE_HOTSWAP */ | 126 | #endif /* HAVE_HOTSWAP */ |
124 | 127 | ||
125 | #ifdef HAVE_MULTIDRIVE | 128 | #ifdef HAVE_MULTIDRIVE |
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c index efce5742d0..1c9fe4300b 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c | |||
@@ -563,7 +563,7 @@ static inline int write_sector(unsigned long start, unsigned int count, | |||
563 | return ret; | 563 | return ret; |
564 | } | 564 | } |
565 | 565 | ||
566 | int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* buf) | 566 | int nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) |
567 | { | 567 | { |
568 | #ifdef HAVE_MULTIVOLUME | 568 | #ifdef HAVE_MULTIVOLUME |
569 | (void)drive; | 569 | (void)drive; |
@@ -590,7 +590,7 @@ int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* bu | |||
590 | return ret; | 590 | return ret; |
591 | } | 591 | } |
592 | 592 | ||
593 | int nand_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf) | 593 | int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf) |
594 | { | 594 | { |
595 | #ifdef HAVE_MULTIVOLUME | 595 | #ifdef HAVE_MULTIVOLUME |
596 | (void)drive; | 596 | (void)drive; |
@@ -662,7 +662,7 @@ void nand_sleepnow(void) | |||
662 | } | 662 | } |
663 | 663 | ||
664 | #ifdef STORAGE_GET_INFO | 664 | #ifdef STORAGE_GET_INFO |
665 | void nand_get_info(IF_MV(int drive,) struct storage_info *info) | 665 | void nand_get_info(IF_MD(int drive,) struct storage_info *info) |
666 | { | 666 | { |
667 | #ifdef HAVE_MULTIVOLUME | 667 | #ifdef HAVE_MULTIVOLUME |
668 | (void)drive; | 668 | (void)drive; |
diff --git a/uisimulator/common/filesystem-sim.c b/uisimulator/common/filesystem-sim.c index f4f6321b7d..d3db25d02b 100644 --- a/uisimulator/common/filesystem-sim.c +++ b/uisimulator/common/filesystem-sim.c | |||
@@ -691,7 +691,7 @@ struct sim_dirent * sim_readdir(DIR *dirp) | |||
691 | 691 | ||
692 | if (readdir_volume(dirstr, entry)) | 692 | if (readdir_volume(dirstr, entry)) |
693 | return entry; | 693 | return entry; |
694 | 694 | ||
695 | OS_DIRENT_T *osdirent = os_readdir(dirstr->osdirp); | 695 | OS_DIRENT_T *osdirent = os_readdir(dirstr->osdirp); |
696 | if (!osdirent) | 696 | if (!osdirent) |
697 | return NULL; | 697 | return NULL; |