summaryrefslogtreecommitdiffstats
path: root/include/envfs.h
diff options
context:
space:
mode:
authorCarsten Schlote <c.schlote@konzeptpark.de>2008-02-15 14:43:12 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2008-02-19 08:56:27 +0100
commit4bc43ee28c7bc30fc9f1aca6f91118a711c3aea4 (patch)
tree454d4227dfe89deb5a9129b685c729b8bb94fe48 /include/envfs.h
parentdb291de28014807ab0e8c97cbadf381c3d781f2d (diff)
downloadbarebox-4bc43ee28c7bc30fc9f1aca6f91118a711c3aea4.tar.gz
barebox-4bc43ee28c7bc30fc9f1aca6f91118a711c3aea4.tar.xz
[general] Fixed remaining defines for envfs in big-endian mode
Trivial - completed macros
Diffstat (limited to 'include/envfs.h')
-rw-r--r--include/envfs.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/include/envfs.h b/include/envfs.h
index 406bc61e75..f5ea9c3efc 100644
--- a/include/envfs.h
+++ b/include/envfs.h
@@ -54,14 +54,10 @@ struct envfs_super {
#define ENVFS_24(x) ((bswap_32(x)) >> 8)
#define ENVFS_32(x) bswap_32(x)
#endif /* not __KERNEL__ */
-#define CRAMFS_GET_NAMELEN(x) (((u8*)(x))[8] & 0x3f)
-#define CRAMFS_GET_OFFSET(x) ((CRAMFS_24(((u32*)(x))[2] & 0xffffff) << 2) |\
- ((((u32*)(x))[2] & 0xc0000000) >> 30))
-#define CRAMFS_SET_NAMELEN(x,y) (((u8*)(x))[8] = (((0x3f & (y))) | \
- (0xc0 & ((u8*)(x))[8])))
-#define CRAMFS_SET_OFFSET(x,y) (((u32*)(x))[2] = (((y) & 3) << 30) | \
- CRAMFS_24((((y) & 0x03ffffff) >> 2)) | \
- (((u32)(((u8*)(x))[8] & 0x3f)) << 24))
+#define ENVFS_GET_NAMELEN(x) ENVFS_32(((x)->namelen))
+#define ENVFS_GET_OFFSET(x) ENVFS_32(((x)->offset))
+#define ENVFS_SET_NAMELEN(x,y)((x)->offset = ENVFS_32((y)))
+#define ENVFS_SET_OFFSET(x,y) ((x)->namelen = ENVFS_32((y)))
#else
#error "__BYTE_ORDER must be __LITTLE_ENDIAN or __BIG_ENDIAN"
#endif