From 856e3d548bc32402f039f88d09e4df0ce020d1dc Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sun, 31 Mar 2024 18:10:38 +0100 Subject: Fix red in dc9d354ed22b Change-Id: Ic6639e85c42f7ebf435ebad2740e921b7b932ead --- firmware/common/disk.c | 4 ++-- firmware/include/dircache_redirect.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'firmware') diff --git a/firmware/common/disk.c b/firmware/common/disk.c index 2fec38995a..9b6454c9a2 100644 --- a/firmware/common/disk.c +++ b/firmware/common/disk.c @@ -513,7 +513,7 @@ void volume_size(IF_MV(int volume,) unsigned long *sizep, unsigned long *freep) } #if defined (HAVE_HOTSWAP) || defined (HAVE_MULTIDRIVE) \ - || defined (HAVE_DIRCACHE) + || defined (HAVE_DIRCACHE) || defined(HAVE_BOOTDATA) enum volume_info_type { #ifdef HAVE_HOTSWAP @@ -592,4 +592,4 @@ bool volume_ismounted(IF_MV_NONVOID(int volume)) #endif /* HAVE_DIRCACHE */ -#endif /* HAVE_HOTSWAP || HAVE_MULTIDRIVE || HAVE_DIRCACHE */ +#endif /* HAVE_HOTSWAP || HAVE_MULTIDRIVE || HAVE_DIRCACHE || HAVE_BOOTDATA */ diff --git a/firmware/include/dircache_redirect.h b/firmware/include/dircache_redirect.h index 32e441c5b3..ddd86c6d86 100644 --- a/firmware/include/dircache_redirect.h +++ b/firmware/include/dircache_redirect.h @@ -152,8 +152,8 @@ static inline bool multiboot_is_boot_volume(int volume) return volume_drive(volume) == 0; #else /* FIXME: Anything else that can get here is a Sansa. */ - return volume_drive(volume) == boot_data.boot_volume || - volume == boot_data.boot_volume; + return volume_drive(volume) == boot_data._boot_volume || + volume == boot_data._boot_volume; #endif } -- cgit v1.2.3