From 45a4e9ffb44234b7311e454b03f7612fe071641f Mon Sep 17 00:00:00 2001
From: Christopher Haster <geky@geky.net>
Date: Thu, 2 May 2024 01:57:18 -0500
Subject: [PATCH] Moved lfsr_ecksum_t back into lfs.c

Now that becksums were proven to not work, we don't need this in lfs.h
anymore.
---
 lfs.c |  7 +++++++
 lfs.h | 37 +++++++++++++++----------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lfs.c b/lfs.c
index 40dc1de4..28acc28f 100644
--- a/lfs.c
+++ b/lfs.c
@@ -1754,6 +1754,13 @@ typedef struct lfsr_tinfo {
 //#endif
 
 
+// erased-state checksum
+typedef struct lfsr_ecksum {
+    // cksize=-1 indicates no ecksum
+    lfs_ssize_t cksize;
+    uint32_t cksum;
+} lfsr_ecksum_t;
+
 // erased-state checksum on-disk encoding
 
 // ecksum encoding:
diff --git a/lfs.h b/lfs.h
index 109a3ad5..2c2ebb83 100644
--- a/lfs.h
+++ b/lfs.h
@@ -371,21 +371,6 @@ typedef struct lfsr_opened {
     lfsr_mdir_t mdir;
 } lfsr_opened_t;
 
-// grm encoding:
-// .---.                  mode:  1 leb128   1 byte
-// |mod|                  mids:  2 leb128s  <=2x5 bytes
-// +- -+- -+- -+- -+- -.  total:            <=11 bytes
-// ' mid x mod         '
-// +                   +
-// '                   '
-// '- -+- -+- -+- -+- -'
-//
-#define LFSR_GRM_DSIZE (1+5+5)
-
-typedef struct lfsr_grm {
-    lfsr_smid_t rms[2];
-} lfsr_grm_t;
-
 
 typedef struct lfs_mdir {
     lfs_block_t pair[2];
@@ -432,13 +417,6 @@ typedef struct lfsr_data {
     } u;
 } lfsr_data_t;
 
-// erased-state checksum
-typedef struct lfsr_ecksum {
-    // cksize=-1 indicates no ecksum
-    lfs_ssize_t cksize;
-    uint32_t cksum;
-} lfsr_ecksum_t;
-
 // littlefs directory type
 typedef struct lfs_dir {
     struct lfs_dir *next;
@@ -560,6 +538,21 @@ typedef struct lfsr_mtree {
     } u;
 } lfsr_mtree_t;
 
+// grm encoding:
+// .---.                  mode:  1 leb128   1 byte
+// |mod|                  mids:  2 leb128s  <=2x5 bytes
+// +- -+- -+- -+- -+- -.  total:            <=11 bytes
+// ' mid x mod         '
+// +                   +
+// '                   '
+// '- -+- -+- -+- -+- -'
+//
+#define LFSR_GRM_DSIZE (1+5+5)
+
+typedef struct lfsr_grm {
+    lfsr_smid_t rms[2];
+} lfsr_grm_t;
+
 // The littlefs filesystem type
 typedef struct lfs {
     lfs_cache_t rcache;