From f37b5a834967eb273c14d532de43bf31ccb51c3a Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sun, 7 Jul 2024 12:28:05 -0400 Subject: 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 --- firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c') 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, 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; #endif int ret = 0; @@ -670,12 +670,12 @@ int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* bu } /* 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)count; (void)buf; -#ifdef HAVE_MULTIVOLUME +#ifdef HAVE_MULTIDRIVE (void)drive; #endif @@ -727,9 +727,9 @@ 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 +#ifdef HAVE_MULTIDRIVE (void)drive; #endif -- cgit v1.2.3