From 8aa8a0a660451e8eafc4aa0bca2116d561cebe4a Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Fri, 27 Jan 2017 22:42:06 +1100
Subject: [PATCH] extmod/vfs_fat: Use SECSIZE macro to determine FatFs sector
size.
---
extmod/vfs_fat.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 45f2991da..a6f2ae806 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -45,6 +45,12 @@
#include "extmod/fsusermount.h"
#include "timeutils.h"
+#if _MAX_SS == _MIN_SS
+#define SECSIZE(fs) (_MIN_SS)
+#else
+#define SECSIZE(fs) ((fs)->ssize)
+#endif
+
#define mp_obj_fat_vfs_t fs_user_mount_t
STATIC mp_obj_t fat_vfs_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@@ -267,7 +273,7 @@ STATIC mp_obj_t fat_vfs_statvfs(mp_obj_t vfs_in, mp_obj_t path_in) {
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
- t->items[0] = MP_OBJ_NEW_SMALL_INT(fatfs->csize * fatfs->ssize); // f_bsize
+ t->items[0] = MP_OBJ_NEW_SMALL_INT(fatfs->csize * SECSIZE(fatfs)); // f_bsize
t->items[1] = t->items[0]; // f_frsize
t->items[2] = MP_OBJ_NEW_SMALL_INT((fatfs->n_fatent - 2) * fatfs->csize); // f_blocks
t->items[3] = MP_OBJ_NEW_SMALL_INT(nclst); // f_bfree
--
GitLab