From 7e48c175add2dada2c217282e2370336ed880dc4 Mon Sep 17 00:00:00 2001 From: dangfan Date: Thu, 12 Oct 2023 22:20:56 +0800 Subject: [PATCH] downgrade littlefs and fix compilation errors --- canokey-crypto | 2 +- include/common.h | 1 + littlefs | 2 +- src/key.c | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/canokey-crypto b/canokey-crypto index 9dd712b7..75192fdc 160000 --- a/canokey-crypto +++ b/canokey-crypto @@ -1 +1 @@ -Subproject commit 9dd712b79da8e28a6ff3b9cb8aeb165223971645 +Subproject commit 75192fdc78a62b16d4238876bd626affd47289c8 diff --git a/include/common.h b/include/common.h index 76862153..f571674b 100644 --- a/include/common.h +++ b/include/common.h @@ -42,6 +42,7 @@ #define HI(x) ((uint8_t)(((x)&0xFF00) >> 8)) #define MIN(a, b) (((a) < (b)) ? (a) : (b)) #define MAX(a, b) (((a) > (b)) ? (a) : (b)) +#define SWAP(x, y, T) do { T SWAP = x; x = y; y = SWAP; } while (0) #define UNUSED(x) ((void)(x)) #define __weak __attribute__((weak)) diff --git a/littlefs b/littlefs index 40dba4a5..9c7e2320 160000 --- a/littlefs +++ b/littlefs @@ -1 +1 @@ -Subproject commit 40dba4a556e0d81dfbe64301a6aa4e18ceca896c +Subproject commit 9c7e232086f865cff0bb96fe753deb66431d91fd diff --git a/src/key.c b/src/key.c index 93c7e1e1..a99aa684 100644 --- a/src/key.c +++ b/src/key.c @@ -3,7 +3,6 @@ #include "memzero.h" #include #include -#include #define KEY_META_ATTR 0xFF #define CEIL_DIV_SQRT2 0xB504F334