Moved endianness stuff into a separate header.

git-svn-id: http://exfat.googlecode.com/svn/trunk@112 60bc1c72-a15a-11de-b98f-4500b42dc123

diff --git a/libexfat/byteorder.h b/libexfat/byteorder.h
new file mode 100644 (file)
index 0000000..4a7cf07
--- /dev/null
+++ b/libexfat/byteorder.h
@@ -0,0 +1,55 @@
+/*
+       byteorder.h (12.01.10)
+       Endianness stuff. exFAT uses little-endian byte order.
+
+       Copyright (C) 2009, 2010  Andrew Nayenko
+
+       This program is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       This program is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef BYTEORDER_H_INCLUDED
+#define BYTEORDER_H_INCLUDED
+
+#include <stdint.h>
+#include <endian.h>
+#include <byteswap.h>
+
+typedef struct { uint16_t __u16; } le16_t;
+typedef struct { uint32_t __u32; } le32_t;
+typedef struct { uint64_t __u64; } le64_t;
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+static inline uint16_t le16_to_cpu(le16_t v) { return v.__u16; }
+static inline uint32_t le32_to_cpu(le32_t v) { return v.__u32; }
+static inline uint64_t le64_to_cpu(le64_t v) { return v.__u64; }
+
+static inline le16_t cpu_to_le16(uint16_t v) { le16_t t = {v}; return t; }
+static inline le32_t cpu_to_le32(uint32_t v) { le32_t t = {v}; return t; }
+static inline le64_t cpu_to_le64(uint64_t v) { le64_t t = {v}; return t; }
+#elif __BYTE_ORDER == __BIG_ENDIAN
+static inline uint16_t le16_to_cpu(le16_t v) { return bswap_16(v.__u16); }
+static inline uint32_t le32_to_cpu(le32_t v) { return bswap_32(v.__u32); }
+static inline uint64_t le64_to_cpu(le64_t v) { return bswap_64(v.__u64); }
+
+static inline le16_t cpu_to_le16(uint16_t v)
+       { le16_t t = {bswap_16(v)}; return t; }
+static inline le32_t cpu_to_le32(uint32_t v)
+       { le32_t t = {bswap_32(v)}; return t; }
+static inline le64_t cpu_to_le64(uint64_t v)
+       { le64_t t = {bswap_64(v)}; return t; }
+#else
+#error Wow! You have a PDP machine?!
+#endif
+
+#endif /* ifndef BYTEORDER_H_INCLUDED */

diff --git a/libexfat/exfatfs.h b/libexfat/exfatfs.h
index ed918be..d0df276 100644 (file)
--- a/libexfat/exfatfs.h
+++ b/libexfat/exfatfs.h
@@ -21,39 +21,10 @@
 #ifndef EXFATFS_H_INCLUDED
 #define EXFATFS_H_INCLUDED
 
-#include <stdint.h>
-#include <endian.h>
-#include <byteswap.h>
+#include "byteorder.h"
 
 typedef uint32_t cluster_t;            /* cluster number */
 
-typedef struct { uint16_t __u16; } le16_t;
-typedef struct { uint32_t __u32; } le32_t;
-typedef struct { uint64_t __u64; } le64_t;
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-static inline uint16_t le16_to_cpu(le16_t v) { return v.__u16; }
-static inline uint32_t le32_to_cpu(le32_t v) { return v.__u32; }
-static inline uint64_t le64_to_cpu(le64_t v) { return v.__u64; }
-
-static inline le16_t cpu_to_le16(uint16_t v) { le16_t t = {v}; return t; }
-static inline le32_t cpu_to_le32(uint32_t v) { le32_t t = {v}; return t; }
-static inline le64_t cpu_to_le64(uint64_t v) { le64_t t = {v}; return t; }
-#elif __BYTE_ORDER == __BIG_ENDIAN
-static inline uint16_t le16_to_cpu(le16_t v) { return bswap_16(v.__u16); }
-static inline uint32_t le32_to_cpu(le32_t v) { return bswap_32(v.__u32); }
-static inline uint64_t le64_to_cpu(le64_t v) { return bswap_64(v.__u64); }
-
-static inline le16_t cpu_to_le16(uint16_t v)
-       { le16_t t = {bswap_16(v)}; return t; }
-static inline le32_t cpu_to_le32(uint32_t v)
-       { le32_t t = {bswap_32(v)}; return t; }
-static inline le64_t cpu_to_le64(uint64_t v)
-       { le64_t t = {bswap_64(v)}; return t; }
-#else
-#error Wow! You have a PDP machine?!
-#endif
-
 #define EXFAT_FIRST_DATA_CLUSTER 2
 
 #define EXFAT_CLUSTER_FREE         0 /* free cluster */