summaryrefslogtreecommitdiff
path: root/libnandfs
diff options
context:
space:
mode:
Diffstat (limited to 'libnandfs')
-rw-r--r--libnandfs/calcformat.c2
-rw-r--r--libnandfs/correctauxilliary.c4
-rw-r--r--libnandfs/ecc.c2
-rw-r--r--libnandfs/eraseblock.c2
-rw-r--r--libnandfs/extracttags.c2
-rw-r--r--libnandfs/findfreeblock.c2
-rw-r--r--libnandfs/formatblock.c2
-rw-r--r--libnandfs/getblockstatus.c2
-rw-r--r--libnandfs/hamming31_26.c2
-rw-r--r--libnandfs/init.c2
-rw-r--r--libnandfs/local.h23
-rw-r--r--libnandfs/markblockbad.c2
-rw-r--r--libnandfs/open.c2
-rw-r--r--libnandfs/readblock.c2
-rw-r--r--libnandfs/readpage.c4
-rw-r--r--libnandfs/readpageauxilliary.c2
-rw-r--r--libnandfs/reformatblock.c2
-rw-r--r--libnandfs/setget.c2
-rw-r--r--libnandfs/updatepage.c2
-rw-r--r--libnandfs/writeblock.c2
-rw-r--r--libnandfs/writepageauxilliary.c2
21 files changed, 35 insertions, 32 deletions
diff --git a/libnandfs/calcformat.c b/libnandfs/calcformat.c
index 498427f5..e258c8f1 100644
--- a/libnandfs/calcformat.c
+++ b/libnandfs/calcformat.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/correctauxilliary.c b/libnandfs/correctauxilliary.c
index 510aeac4..09f60115 100644
--- a/libnandfs/correctauxilliary.c
+++ b/libnandfs/correctauxilliary.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
@@ -60,7 +60,7 @@ _nandfscorrectauxiliary(NandfsAuxiliary *hdr)
else {
if (hdr->tag != LogfsTnone) {
ulong tmp = getbig4(hdr->parth);
- if (tmp != 0xfffffffff && _nandfshamming31_26correct(&tmp)) {
+ if (tmp != 0xffffffff && _nandfshamming31_26correct(&tmp)) {
putbig4(hdr->parth, tmp);
if (e != LogfsLowLevelReadResultOk)
e = LogfsLowLevelReadResultSoftError;
diff --git a/libnandfs/ecc.c b/libnandfs/ecc.c
index 1cd86d20..c4c1612a 100644
--- a/libnandfs/ecc.c
+++ b/libnandfs/ecc.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "nandecc.h"
static uchar ecctab[] = {
diff --git a/libnandfs/eraseblock.c b/libnandfs/eraseblock.c
index 2ecd490f..1d4d8bbf 100644
--- a/libnandfs/eraseblock.c
+++ b/libnandfs/eraseblock.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/extracttags.c b/libnandfs/extracttags.c
index be3fc2da..f6a8aaee 100644
--- a/libnandfs/extracttags.c
+++ b/libnandfs/extracttags.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/findfreeblock.c b/libnandfs/findfreeblock.c
index e17f729a..b538ef0a 100644
--- a/libnandfs/findfreeblock.c
+++ b/libnandfs/findfreeblock.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/formatblock.c b/libnandfs/formatblock.c
index 8f37e2c9..146449b1 100644
--- a/libnandfs/formatblock.c
+++ b/libnandfs/formatblock.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/getblockstatus.c b/libnandfs/getblockstatus.c
index 0ebaf5e1..7cf59e38 100644
--- a/libnandfs/getblockstatus.c
+++ b/libnandfs/getblockstatus.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/hamming31_26.c b/libnandfs/hamming31_26.c
index a94262b7..331c9232 100644
--- a/libnandfs/hamming31_26.c
+++ b/libnandfs/hamming31_26.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
diff --git a/libnandfs/init.c b/libnandfs/init.c
index ebfd6a67..c0a926b8 100644
--- a/libnandfs/init.c
+++ b/libnandfs/init.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/local.h b/libnandfs/local.h
index d5b4eecb..5c3df452 100644
--- a/libnandfs/local.h
+++ b/libnandfs/local.h
@@ -1,16 +1,19 @@
-typedef struct NandfsBlockData {
+typedef struct NandfsBlockData NandfsBlockData;
+typedef struct NandfsAuxiliary NandfsAuxiliary;
+
+struct NandfsBlockData {
ulong path;
short tag;
ulong nerase;
int partial;
-} NandfsBlockData;
+};
struct Nandfs {
LogfsLowLevel ll;
- char *(*read)(void *magic, void *buf, long nbytes, ulong offset);
- char *(*write)(void *magic, void *buf, long nbytes, ulong offset);
- char *(*erase)(void *magic, long blockaddr);
- char *(*sync)(void *magic);
+ char *(*read)(void*, void*, long, ulong);
+ char *(*write)(void*, void*, long, ulong);
+ char *(*erase)(void*, long blockaddr);
+ char *(*sync)(void*);
void *magic;
long rawblocksize;
long baseblock;
@@ -21,7 +24,7 @@ struct Nandfs {
int printbad;
};
-typedef struct NandfsAuxiliary {
+struct NandfsAuxiliary {
uchar parth[4]; // ggpppppp pppppppp pppppppp pp1hhhhh (bigendian) self-protected
uchar tag; // self-protecting
uchar blockstatus; // self-protecting
@@ -29,7 +32,7 @@ typedef struct NandfsAuxiliary {
uchar ecc2[3]; // self-protecting
uchar nerasemagiclsw[2]; // mmmmmm mmeeeeee eeeeeeeeee ee1hhhhh (bigendian) self-protected
uchar ecc1[3]; // self-protecting
-} NandfsAuxiliary;
+};
#define getbig2(p) (((p)[0] << 8) | (p)[1])
#define getbig4(p) (((p)[0] << 24) | ((p)[1] << 16) | ((p)[2] << 8) | (p)[3])
@@ -38,7 +41,7 @@ typedef struct NandfsAuxiliary {
#define putbig2(p, q) ((p)[0] = (q) >> 8, (p)[1] = (q))
#define putbig4(p, q) ((p)[0] = (q) >> 24, (p)[1] = (q) >> 16, (p)[2] = (q) >> 8, (p)[3] = (q))
-LogfsLowLevelReadResult _nandfscorrectauxiliary(NandfsAuxiliary *hdr);
+LogfsLowLevelReadResult _nandfscorrectauxiliary(NandfsAuxiliary*);
extern uchar _nandfsvalidtags[];
extern int _nandfsvalidtagscount;
@@ -46,6 +49,6 @@ extern int _nandfsvalidtagscount;
ulong _nandfshamming31_26calc(ulong in);
int _nandfshamming31_26correct(ulong *in);
-void _nandfsextracttags(NandfsAuxiliary *hdr, NandfsTags *tags);
+void _nandfsextracttags(NandfsAuxiliary*, NandfsTags*);
extern char Enomem[], Eperm[], Eio[];
diff --git a/libnandfs/markblockbad.c b/libnandfs/markblockbad.c
index 6414c8d2..f08726ce 100644
--- a/libnandfs/markblockbad.c
+++ b/libnandfs/markblockbad.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/open.c b/libnandfs/open.c
index 12b49849..8a20a52f 100644
--- a/libnandfs/open.c
+++ b/libnandfs/open.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/readblock.c b/libnandfs/readblock.c
index cbf3222b..4c4d9f7c 100644
--- a/libnandfs/readblock.c
+++ b/libnandfs/readblock.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/readpage.c b/libnandfs/readpage.c
index 9ae3ed43..9af91060 100644
--- a/libnandfs/readpage.c
+++ b/libnandfs/readpage.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "nandecc.h"
@@ -46,7 +46,7 @@ nandfsreadpagerange(Nandfs *nandfs, void *buf, long block, int page, int offset,
uchar tmpbuf[NandfsPageSize];
errmsg = nandfsreadpage(nandfs, tmpbuf, nil, block, page, 1, result);
if (errmsg == nil)
- memcpy(buf, tmpbuf + offset, count);
+ memmove(buf, tmpbuf + offset, count);
return errmsg;
}
diff --git a/libnandfs/readpageauxilliary.c b/libnandfs/readpageauxilliary.c
index ba71d2b5..252d59ae 100644
--- a/libnandfs/readpageauxilliary.c
+++ b/libnandfs/readpageauxilliary.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/reformatblock.c b/libnandfs/reformatblock.c
index c0d790bf..9130552c 100644
--- a/libnandfs/reformatblock.c
+++ b/libnandfs/reformatblock.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/setget.c b/libnandfs/setget.c
index 4a25f494..c5efdeff 100644
--- a/libnandfs/setget.c
+++ b/libnandfs/setget.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/updatepage.c b/libnandfs/updatepage.c
index afe70b79..4acb65db 100644
--- a/libnandfs/updatepage.c
+++ b/libnandfs/updatepage.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "nandecc.h"
diff --git a/libnandfs/writeblock.c b/libnandfs/writeblock.c
index 0e4b9c3d..695c96e7 100644
--- a/libnandfs/writeblock.c
+++ b/libnandfs/writeblock.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
diff --git a/libnandfs/writepageauxilliary.c b/libnandfs/writepageauxilliary.c
index 6d2d6b87..70b1a5f4 100644
--- a/libnandfs/writepageauxilliary.c
+++ b/libnandfs/writepageauxilliary.c
@@ -1,4 +1,4 @@
-#include "lib9.h"
+#include "logfsos.h"
#include "logfs.h"
#include "nandfs.h"
#include "local.h"
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-10 05:12:32 +0000