Added endianness support for YTIME_T

[yaffs2.git] / yaffs_endian.h

diff --git a/yaffs_endian.h b/yaffs_endian.h
index d9b4e07d21f334eef70d412f5fe75209a0a757f6..0f1ef0491e73e29d334aadde52fab103f679048d 100644 (file)
--- a/yaffs_endian.h
+++ b/yaffs_endian.h
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -26,22 +25,44 @@ static inline u32 swap_u32(u32 val)
               ((val <<24) & 0xff000000);
 }
 
+static inline u64 swap_u64(u64 val)
+{
+       return ((val >> 56) & 0x00000000000000ff) |
+              ((val >> 40) & 0x000000000000ff00) |
+              ((val >> 24) & 0x0000000000ff0000) |
+              ((val >> 8)  & 0x00000000ff000000) |
+              ((val << 8)  & 0x000000ff00000000) |
+              ((val << 24) & 0x0000ff0000000000) |
+              ((val << 40) & 0x00ff000000000000) |
+              ((val << 56) & 0xff00000000000000);
+}
+
+//YTIME_T can be a 32 or 64 bit number.
+#if YAFFS_USE_32_BIT_TIME_T
+       #define swap_ytime_t( val ) swap_u32(val)
+#else
+       #define swap_ytime_t( val ) swap_u64(val)
+#endif
+
+//swap a signed 32 bit integer.
 #define swap_s32(val) \
        (s32)(swap_u32((u32)(val)))
 
 static inline loff_t swap_loff_t(loff_t lval)
 {
-       u32 vall = swap_u32((u32) (lval & 0xffffffff));
+       u32 vall = swap_u32(FSIZE_LOW(lval));
        u32 valh;
 
        if (sizeof(loff_t) == sizeof(u32))
                return (loff_t) vall;
 
-       valh = swap_u32((u32) ((lval >> 32) & 0xffffffff));
+       valh = swap_u32(FSIZE_HIGH(lval));
 
-       return (loff_t)((((u64)vall) << 32) | valh);
+       return FSIZE_COMBINE(vall, valh); /*NB: h and l are swapped. */
 }
 
+
+
 struct yaffs_dev;
 void yaffs_do_endian_s32(struct yaffs_dev *dev, s32 *val);
 void yaffs_do_endian_u32(struct yaffs_dev *dev, u32 *val);