Changeset d99c1d2 in mainline for kernel/arch/amd64/include

Timestamp:

2010-03-23T14:41:06Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1b1164e8

Parents:

7c682dd1

Message:

use [u]int{8|16|32|64}_t type definitions as detected by the autotool
replace direct usage of arch/types.h with typedefs.h

Location:

kernel/arch/amd64/include

Files:

• asm.h (modified) (1 diff)
• atomic.h (modified) (1 diff)
• context.h (modified) (1 diff)
• cpuid.h (modified) (1 diff)
• debugger.h (modified) (1 diff)
• faddr.h (modified) (1 diff)
• interrupt.h (modified) (1 diff)
• mm/frame.h (modified) (1 diff)
• mm/page.h (modified) (1 diff)
• pm.h (modified) (1 diff)
• proc/task.h (modified) (1 diff)
• types.h (modified) (2 diffs)

kernel/arch/amd64/include/asm.h

@@ -37 +37 @@
 
 #include <config.h>
-#include <arch/types.h>
 #include <typedefs.h>
 

kernel/arch/amd64/include/atomic.h

@@ -36 +36 @@
 #define KERN_amd64_ATOMIC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/barrier.h>
 #include <preemption.h>

kernel/arch/amd64/include/context.h

@@ -38 +38 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /* According to ABI the stack MUST be aligned on 

kernel/arch/amd64/include/cpuid.h

@@ -48 +48 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {

kernel/arch/amd64/include/debugger.h

@@ -36 +36 @@
 #define KERN_amd64_DEBUGGER_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define BKPOINTS_MAX 4

kernel/arch/amd64/include/faddr.h

@@ -36 +36 @@
 #define KERN_amd64_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)             ((uintptr_t) (fptr))

kernel/arch/amd64/include/interrupt.h

@@ -36 +36 @@
 #define KERN_amd64_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/pm.h>
 

kernel/arch/amd64/include/mm/frame.h

@@ -37 +37 @@
 
 #ifndef __ASM__
-#include <arch/types.h>
+#include <typedefs.h>
 #endif /* __ASM__ */
 

kernel/arch/amd64/include/mm/page.h

@@ -57 +57 @@
 #ifndef __ASM__
 #       include <mm/mm.h>
-#       include <arch/types.h>
+#       include <typedefs.h>
 #       include <arch/interrupt.h>
 

kernel/arch/amd64/include/pm.h

@@ -37 +37 @@
 
 #ifndef __ASM__
-        #include <arch/types.h>
+        #include <typedefs.h>
         #include <arch/context.h>
 #endif

kernel/arch/amd64/include/proc/task.h

@@ -36 +36 @@
 #define KERN_amd64_TASK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/bitmap.h>
 

kernel/arch/amd64/include/types.h

@@ -36 +36 @@
 #define KERN_amd64_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
 typedef uint64_t size_t;
 
@@ -61 +51 @@
 
 /**< Formats for uintptr_t, size_t */
-#define PRIp "llx"
-#define PRIs "llu"
+#define PRIp  "llx"
+#define PRIs  "llu"
 
 /**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
-#define PRId8 "d"
-#define PRId16 "d"
-#define PRId32 "d"
-#define PRId64 "lld"
-#define PRIdn "lld"
+#define PRId8   "d"
+#define PRId16  "d"
+#define PRId32  "d"
+#define PRId64  "lld"
+#define PRIdn   "lld"
 
-#define PRIu8 "u"
-#define PRIu16 "u"
-#define PRIu32 "u"
-#define PRIu64 "llu"
-#define PRIun "llu"
+#define PRIu8   "u"
+#define PRIu16  "u"
+#define PRIu32  "u"
+#define PRIu64  "llu"
+#define PRIun   "llu"
 
-#define PRIx8 "x"
-#define PRIx16 "x"
-#define PRIx32 "x"
-#define PRIx64 "llx"
-#define PRIxn "llx"
+#define PRIx8   "x"
+#define PRIx16  "x"
+#define PRIx32  "x"
+#define PRIx64  "llx"
+#define PRIxn   "llx"
 
 #endif