Changeset 04803bf in mainline for kernel/arch/ia32/include/types.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

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

kernel/arch/ia32/include/types.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -36 +36 @@
 #define KERN_ia32_TYPES_H_
 
-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;
 
@@ -53 +43 @@
 typedef uint32_t ipl_t;
 
-typedef uint32_t unative_t;
+typedef uint32_t sysarg_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 INTN_C(c)   INT32_C(c)
+#define UINTN_C(c)  UINT32_C(c)
 
-#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 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. */
-
-/** Page Table Entry. */
-typedef struct {
-        unsigned present : 1;
-        unsigned writeable : 1;
-        unsigned uaccessible : 1;
-        unsigned page_write_through : 1;
-        unsigned page_cache_disable : 1;
-        unsigned accessed : 1;
-        unsigned dirty : 1;
-        unsigned pat : 1;
-        unsigned global : 1;
-        unsigned soft_valid : 1;        /**< Valid content even if the present bit is not set. */
-        unsigned avl : 2;
-        unsigned frame_address : 20;
-} __attribute__ ((packed)) pte_t;
+#define PRIdn  PRId32  /**< Format for native_t. */
+#define PRIun  PRIu32  /**< Format for sysarg_t. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif