From 5a2bd580cdd3d83daef3e5c0da1cf0b0236f1d05 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sun, 7 Jul 2024 15:01:02 -0400 Subject: Hopefully fix the last of the stragglers. * xDuoo X3 fix some warnings due to an incorrect #ifdef * stub storage_removeable() and storage_present() for non-HOTSWAP builds * sim_trigger_external() is gated by HOTSWAP, not MULTIDRIVE Change-Id: I38f14fdfeba13957899c378051d49afc2e8245e5 --- firmware/target/hosted/sdl/button-sdl.c | 2 +- firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'firmware/target') diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c index 1055d7e0b9..b5f3720a3b 100644 --- a/firmware/target/hosted/sdl/button-sdl.c +++ b/firmware/target/hosted/sdl/button-sdl.c @@ -340,7 +340,7 @@ static void button_event(int key, bool pressed) } return; #endif -#ifdef HAVE_MULTIDRIVE +#ifdef HAVE_HOTSWAP case EXT_KEY: if (!pressed) sim_trigger_external(!storage_present(1)); diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c index 1c9fe4300b..914cd6d9d3 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c @@ -565,7 +565,7 @@ static inline int write_sector(unsigned long start, unsigned int count, 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; @@ -592,7 +592,7 @@ int nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* bu int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf) { -#ifdef HAVE_MULTIVOLUME +#ifdef HAVE_MULTIDRIVE (void)drive; #endif int ret = 0; @@ -664,7 +664,7 @@ void nand_sleepnow(void) #ifdef STORAGE_GET_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