Merged bits.h and bytes.h

5 files changed, 56 insertions, 60 deletions

diff --git a/common/bytes.c b/common/bits.c
index a5b3c4a..ca99ed2 100644
--- a/common/bytes.c
+++ b/common/bits.c
@@ -1,6 +1,6 @@
 #include <apos/types.h>
 #include <apos/attrs.h>
-#include <apos/bytes.h>
+#include <apos/bits.h>
 #include <apos/builtin.h>
 
 #undef __bswap16
diff --git a/common/elf.c b/common/elf.c
index 6b7b6dd..9ce357d 100644
--- a/common/elf.c
+++ b/common/elf.c
@@ -1,6 +1,6 @@
 #include <apos/elf.h>
 #include <apos/vmem.h>
-#include <apos/bytes.h>
+#include <apos/bits.h>
 #include <apos/string.h>
 
 static uint8_t __elf_to_uvflags(uint8_t elf_flags)
diff --git a/include/apos/bits.h b/include/apos/bits.h
index 79523db..1e1106a 100644
--- a/include/apos/bits.h
+++ b/include/apos/bits.h
@@ -1,6 +1,9 @@
 #ifndef APOS_BITS_H
 #define APOS_BITS_H
 
+#include <apos/types.h>
+#include <apos/builtin.h>
+
 #define __is_set(x, y) ((x) & (y))
 #define __set_bit(x, y) ((x) |= (y))
 #define __clear_bit(x, y) ((x) &= ~(y))
@@ -9,4 +12,54 @@
 #define __set_nbit(x, y) (__set_bit((x), 1 << (y)))
 #define __clear_nbit(x, y) (__clear_bit((x), 1 << (y)))
 
+uint16_t __bswap16(uint16_t u);
+uint32_t __bswap32(uint32_t u);
+uint64_t __bswap64(uint64_t u);
+
+#if __has_builtin(__builtin_bswap16)
+#define __bswap16(x) __builtin_bswap16(x)
+#endif
+
+#if __has_builtin(__builtin_bswap32)
+#define __bswap32(x) __builtin_bswap32(x)
+#endif
+
+#if __has_builtin(__builtin_bswap64)
+#define __bswap64(x) __builtin_bswap64(x)
+#endif
+
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define be16_to_cpu(x) __bswap16(x)
+#define be32_to_cpu(x) __bswap32(x)
+#define be64_to_cpu(x) __bswap64(x)
+
+#define cpu_to_be16(x) __bswap16(x)
+#define cpu_to_be32(x) __bswap32(x)
+#define cpu_to_be64(x) __bswap64(x)
+
+#define le16_to_cpu(x) (x)
+#define le32_to_cpu(x) (x)
+#define le64_to_cpu(x) (x)
+
+#define cpu_to_le16(x) (x)
+#define cpu_to_le32(x) (x)
+#define cpu_to_le64(x) (x)
+#else
+#define be16_to_cpu(x) (x)
+#define be32_to_cpu(x) (x)
+#define be64_to_cpu(x) (x)
+
+#define cpu_to_be16(x) (x)
+#define cpu_to_be32(x) (x)
+#define cpu_to_be64(x) (x)
+
+#define le16_to_cpu(x) __bswap16(x)
+#define le32_to_cpu(x) __bswap32(x)
+#define le64_to_cpu(x) __bswap64(x)
+
+#define cpu_to_le16(x) __bswap16(x)
+#define cpu_to_le32(x) __bswap32(x)
+#define cpu_to_le64(x) __bswap64(x)
+#endif
+
 #endif /* APOS_BITS_H */
diff --git a/include/apos/bytes.h b/include/apos/bytes.h
deleted file mode 100644
index 37fe084..0000000
--- a/include/apos/bytes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef APOS_BYTES_H
-#define APOS_BYTES_H
-
-#include <apos/types.h>
-#include <apos/builtin.h>
-
-uint16_t __bswap16(uint16_t u);
-uint32_t __bswap32(uint32_t u);
-uint64_t __bswap64(uint64_t u);
-
-#if __has_builtin(__builtin_bswap16)
-#define __bswap16(x) __builtin_bswap16(x)
-#endif
-
-#if __has_builtin(__builtin_bswap32)
-#define __bswap32(x) __builtin_bswap32(x)
-#endif
-
-#if __has_builtin(__builtin_bswap64)
-#define __bswap64(x) __builtin_bswap64(x)
-#endif
-
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#define be16_to_cpu(x) __bswap16(x)
-#define be32_to_cpu(x) __bswap32(x)
-#define be64_to_cpu(x) __bswap64(x)
-
-#define cpu_to_be16(x) __bswap16(x)
-#define cpu_to_be32(x) __bswap32(x)
-#define cpu_to_be64(x) __bswap64(x)
-
-#define le16_to_cpu(x) (x)
-#define le32_to_cpu(x) (x)
-#define le64_to_cpu(x) (x)
-
-#define cpu_to_le16(x) (x)
-#define cpu_to_le32(x) (x)
-#define cpu_to_le64(x) (x)
-#else
-#define be16_to_cpu(x) (x)
-#define be32_to_cpu(x) (x)
-#define be64_to_cpu(x) (x)
-
-#define cpu_to_be16(x) (x)
-#define cpu_to_be32(x) (x)
-#define cpu_to_be64(x) (x)
-
-#define le16_to_cpu(x) __bswap16(x)
-#define le32_to_cpu(x) __bswap32(x)
-#define le64_to_cpu(x) __bswap64(x)
-
-#define cpu_to_le16(x) __bswap16(x)
-#define cpu_to_le32(x) __bswap32(x)
-#define cpu_to_le64(x) __bswap64(x)
-#endif
-
-#endif /* APOS_BYTES_H */
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 96da42e..0e8909c 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -4,7 +4,7 @@
 
 #include <apos/types.h>
 #include <apos/string.h>
-#include <apos/bytes.h>
+#include <apos/bits.h>
 
 typedef int16_t fdt16_t;
 typedef int32_t fdt32_t;