Consolidate the swab macros into one location

Signed-off-by: Josh Boyer <jwboyer@gmail.com>

1 files changed, 1 insertions, 25 deletions

diff --git a/mkfs.jffs.c b/mkfs.jffs.c
index 942a093..7e8de96 100644
--- a/mkfs.jffs.c
+++ b/mkfs.jffs.c
@@ -17,33 +17,9 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <linux/types.h>
-#include <asm/byteorder.h>
+#include <mtd_swab.h>
 #include <ctype.h>
 
-#define swab16(x) \
-        ((__u16)( \
-                (((__u16)(x) & (__u16)0x00ffU) << 8) | \
-                (((__u16)(x) & (__u16)0xff00U) >> 8) ))
-#define swab32(x) \
-        ((__u32)( \
-                (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
-                (((__u32)(x) & (__u32)0x0000ff00UL) <<  8) | \
-                (((__u32)(x) & (__u32)0x00ff0000UL) >>  8) | \
-                (((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define cpu_to_le16(x) ({ __u16 _x = x; swab16(_x); })
-#define cpu_to_le32(x) ({ __u32 _x = x; swab32(_x); })
-#define cpu_to_be16(x) (x)
-#define cpu_to_be32(x) (x)
-#else
-#define cpu_to_le16(x) (x)
-#define cpu_to_le32(x) (x)
-#define cpu_to_be16(x) ({ __u16 _x = x; swab16(_x); })
-#define cpu_to_be32(x) ({ __u32 _x = x; swab32(_x); })
-#endif
-#define le32_to_cpu(x) cpu_to_le32(x)
-#define be32_to_cpu(x) cpu_to_be32(x)
 
 #define BLOCK_SIZE 1024
 #define JFFS_MAGIC 0x34383931 /* "1984" */