Changeset 371bd7d in mainline for kernel/arch/arm32/include/types.h

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/arm32/include/types.h (modified) (3 diffs)

kernel/arch/arm32/include/types.h

@@ -27 +27 @@
  */
 
-/** @addtogroup arm32   
+/** @addtogroup arm32
  * @{
  */
@@ -38 +38 @@
 
 #ifndef DOXYGEN
-#       define ATTRIBUTE_PACKED __attribute__ ((packed))
+        #define ATTRIBUTE_PACKED __attribute__((packed))
 #else
-#       define ATTRIBUTE_PACKED
+        #define ATTRIBUTE_PACKED
 #endif
-
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed long int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long uint32_t;
-typedef unsigned long long uint64_t;
 
 typedef uint32_t size_t;
@@ -62 +52 @@
 typedef uint32_t unative_t;
 typedef int32_t native_t;
+typedef uint32_t atomic_count_t;
 
 typedef struct {
 } fncptr_t;
 
-#define PRIp "x"        /**< Format for uintptr_t. */
-#define PRIs "u"        /**< Format for size_t. */
+#define PRIp "x"  /**< Format for uintptr_t. */
+#define PRIs "u"  /**< Format for size_t. */
 
-#define PRId8 "d"       /**< Format for int8_t. */
-#define PRId16 "d"      /**< Format for int16_t. */
-#define PRId32 "d"      /**< Format for int32_t. */
-#define PRId64 "lld"    /**< Format for int64_t. */
-#define PRIdn "d"       /**< Format for native_t. */
+#define PRId8 "d"     /**< Format for int8_t. */
+#define PRId16 "d"    /**< Format for int16_t. */
+#define PRId32 "d"    /**< Format for int32_t. */
+#define PRId64 "lld"  /**< Format for int64_t. */
+#define PRIdn "d"     /**< Format for native_t. */
 
-#define PRIu8 "u"       /**< Format for uint8_t. */
-#define PRIu16 "u"      /**< Format for uint16_t. */
-#define PRIu32 "u"      /**< Format for uint32_t. */
-#define PRIu64 "llu"    /**< Format for uint64_t. */
-#define PRIun "u"       /**< Format for unative_t. */
+#define PRIu8 "u"     /**< Format for uint8_t. */
+#define PRIu16 "u"    /**< Format for uint16_t. */
+#define PRIu32 "u"    /**< Format for uint32_t. */
+#define PRIu64 "llu"  /**< Format for uint64_t. */
+#define PRIun "u"     /**< Format for unative_t. */
 
-#define PRIx8 "x"       /**< Format for hexadecimal (u)int8_t. */
-#define PRIx16 "x"      /**< Format for hexadecimal (u)int16_t. */
-#define PRIx32 "x"      /**< Format for hexadecimal (u)uint32_t. */
-#define PRIx64 "llx"    /**< Format for hexadecimal (u)int64_t. */
-#define PRIxn "x"       /**< Format for hexadecimal (u)native_t. */
+#define PRIx8 "x"     /**< Format for hexadecimal (u)int8_t. */
+#define PRIx16 "x"    /**< Format for hexadecimal (u)int16_t. */
+#define PRIx32 "x"    /**< Format for hexadecimal (u)uint32_t. */
+#define PRIx64 "llx"  /**< Format for hexadecimal (u)int64_t. */
+#define PRIxn "x"     /**< Format for hexadecimal (u)native_t. */
 
 #endif