From bcd655fd8d603419cb34fb477f582111f564d989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiesner=20Andr=C3=A1s?= Date: Sat, 11 Nov 2023 20:06:40 +0100 Subject: [PATCH] - misplaced macro fixed - volume size added to volume listing --- fs/fat32/fat32.h | 8 ++++---- mount/mount.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/fat32/fat32.h b/fs/fat32/fat32.h index 07d97c2..8cc990a 100644 --- a/fs/fat32/fat32.h +++ b/fs/fat32/fat32.h @@ -1,15 +1,15 @@ -#ifndef EMBPART_FAT32_H -#define EMBPART_FAT32_H +#ifndef CORE_EMBPART_FS_FAT32_FAT32 +#define CORE_EMBPART_FS_FAT32_FAT32 #include -#ifdef __linux #include #include "../../MassStorage.h" #include "../fs_driver.h" +#ifdef __linux #define MSG(...) printf(__VA_ARGS__) -#endif +#endif /* CORE_EMBPART_FS_FAT32_FAT32 */ #define FAT32_CHS_PART_ID (0x0B) #define FAT32_LBA_PART_ID (0x0C) diff --git a/mount/mount.c b/mount/mount.c index 054cccb..98a6314 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -186,7 +186,7 @@ void mnt_list(const char *dir) { // if if ((dir[0] == '\0') || ((dir[0] == MNT_DIRSEP) && (dir[1] == '\0'))) { for (uint8_t i = 0; i < mtab.mounted_vols; i++) { - MSG("/%s VOLUME\n", mtab.vols[i].mnt_name); + MSG("/%s %.3f MB VOLUME\n", mtab.vols[i].mnt_name, mtab.vols[i].part_size * 1E-06); } return; }