Changeset ac47b7c2 in mainline for kernel/generic

Timestamp:

2009-06-18T08:30:50Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

12956e57

Parents:

553492be

Message:

define endianess externally to be able to exactly specify whether we are using UTF-32LE or UTF-32BE
quit messing with BOM in UTF-32

Location:

kernel/generic

Files:

• include/byteorder.h (modified) (2 diffs)
• include/string.h (modified) (1 diff)
• src/printf/printf_core.c (modified) (1 diff)

kernel/generic/include/byteorder.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -36 +36 @@
 #define KERN_BYTEORDER_H_
 
-#include <arch/byteorder.h>
 #include <arch/types.h>
 
-#if !(defined(ARCH_IS_BIG_ENDIAN) ^ defined(ARCH_IS_LITTLE_ENDIAN))
-#error The architecture must be either big-endian or little-endian.
+#if !(defined(__BE__) ^ defined(__LE__))
+        #error The architecture must be either big-endian or little-endian.
 #endif
 
-#ifdef ARCH_IS_BIG_ENDIAN
+#ifdef __BE__
 
-#define uint16_t_le2host(n)             uint16_t_byteorder_swap(n)
-#define uint32_t_le2host(n)             uint32_t_byteorder_swap(n)
-#define uint64_t_le2host(n)             uint64_t_byteorder_swap(n)
+#define uint16_t_le2host(n)  (uint16_t_byteorder_swap(n))
+#define uint32_t_le2host(n)  (uint32_t_byteorder_swap(n))
+#define uint64_t_le2host(n)  (uint64_t_byteorder_swap(n))
 
-#define uint16_t_be2host(n)             (n)
-#define uint32_t_be2host(n)             (n)
-#define uint64_t_be2host(n)             (n)
+#define uint16_t_be2host(n)  (n)
+#define uint32_t_be2host(n)  (n)
+#define uint64_t_be2host(n)  (n)
 
-#define host2uint16_t_le(n)             uint16_t_byteorder_swap(n)
-#define host2uint32_t_le(n)             uint32_t_byteorder_swap(n)
-#define host2uint64_t_le(n)             uint64_t_byteorder_swap(n)
+#define host2uint16_t_le(n)  (uint16_t_byteorder_swap(n))
+#define host2uint32_t_le(n)  (uint32_t_byteorder_swap(n))
+#define host2uint64_t_le(n)  (uint64_t_byteorder_swap(n))
 
-#define host2uint16_t_be(n)             (n)
-#define host2uint32_t_be(n)             (n)
-#define host2uint64_t_be(n)             (n)
+#define host2uint16_t_be(n)  (n)
+#define host2uint32_t_be(n)  (n)
+#define host2uint64_t_be(n)  (n)
 
 #else
 
-#define uint16_t_le2host(n)             (n)
-#define uint32_t_le2host(n)             (n)
-#define uint64_t_le2host(n)             (n)
+#define uint16_t_le2host(n)  (n)
+#define uint32_t_le2host(n)  (n)
+#define uint64_t_le2host(n)  (n)
 
-#define uint16_t_be2host(n)             uint16_t_byteorder_swap(n)
-#define uint32_t_be2host(n)             uint32_t_byteorder_swap(n)
-#define uint64_t_be2host(n)             uint64_t_byteorder_swap(n)
+#define uint16_t_be2host(n)  (uint16_t_byteorder_swap(n))
+#define uint32_t_be2host(n)  (uint32_t_byteorder_swap(n))
+#define uint64_t_be2host(n)  (uint64_t_byteorder_swap(n))
 
-#define host2uint16_t_le(n)             (n)
-#define host2uint32_t_le(n)             (n)
-#define host2uint64_t_le(n)             (n)
+#define host2uint16_t_le(n)  (n)
+#define host2uint32_t_le(n)  (n)
+#define host2uint64_t_le(n)  (n)
 
-#define host2uint16_t_be(n)             uint16_t_byteorder_swap(n)
-#define host2uint32_t_be(n)             uint32_t_byteorder_swap(n)
-#define host2uint64_t_be(n)             uint64_t_byteorder_swap(n)
+#define host2uint16_t_be(n)  (uint16_t_byteorder_swap(n))
+#define host2uint32_t_be(n)  (uint32_t_byteorder_swap(n))
+#define host2uint64_t_be(n)  (uint64_t_byteorder_swap(n))
 
 #endif

kernel/generic/include/string.h

@@ -58 +58 @@
 #define U_CURSOR       0x2588
 
-#define U_BOM          0xfeff
-
 /**< No size limit constant */
 #define STR_NO_LIMIT  ((size_t) -1)

kernel/generic/src/printf/printf_core.c

@@ -302 +302 @@
         if (str == NULL)
                 return printf_putstr(nullstr, ps);
-        
-        if (*str == U_BOM)
-                str++;
         
         /* Print leading spaces. */