Changeset 7f1c620 in mainline for arch/ia32/include/mm/page.h

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• arch/ia32/include/mm/page.h (modified) (3 diffs)

arch/ia32/include/mm/page.h

@@ -44 +44 @@
 
 #ifndef __ASM__
-#       define KA2PA(x) (((__address) (x)) - 0x80000000)
-#       define PA2KA(x) (((__address) (x)) + 0x80000000)
+#       define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
+#       define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)
 #else
 #       define KA2PA(x) ((x) - 0x80000000)
@@ -68 +68 @@
 #define GET_PTL2_ADDRESS_ARCH(ptl1, i)          (ptl1)
 #define GET_PTL3_ADDRESS_ARCH(ptl2, i)          (ptl2)
-#define GET_FRAME_ADDRESS_ARCH(ptl3, i)         ((__address)((((pte_t *)(ptl3))[(i)].frame_address)<<12))
+#define GET_FRAME_ADDRESS_ARCH(ptl3, i)         ((uintptr_t)((((pte_t *)(ptl3))[(i)].frame_address)<<12))
 
-#define SET_PTL0_ADDRESS_ARCH(ptl0)             (write_cr3((__address) (ptl0)))
+#define SET_PTL0_ADDRESS_ARCH(ptl0)             (write_cr3((uintptr_t) (ptl0)))
 #define SET_PTL1_ADDRESS_ARCH(ptl0, i, a)       (((pte_t *)(ptl0))[(i)].frame_address = (a)>>12)
 #define SET_PTL2_ADDRESS_ARCH(ptl1, i, a)
@@ -86 +86 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)        set_pt_flags((pte_t *)(ptl3), (index_t)(i), (x))
 
-#define PTE_VALID_ARCH(p)                       (*((__u32 *) (p)) != 0)
+#define PTE_VALID_ARCH(p)                       (*((uint32_t *) (p)) != 0)
 #define PTE_PRESENT_ARCH(p)                     ((p)->present != 0)
 #define PTE_GET_FRAME_ARCH(p)                   ((p)->frame_address<<FRAME_WIDTH)