Changeset 98000fb in mainline for kernel/arch/mips32/include

Timestamp:

2009-06-03T19:34:45Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

301ff30

Parents:

69e68e3

Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

Location:

kernel/arch/mips32/include

Files:

• arch.h (modified) (1 diff)
• debugger.h (modified) (1 diff)
• mm/page.h (modified) (4 diffs)
• types.h (modified) (2 diffs)

kernel/arch/mips32/include/arch.h

@@ -43 +43 @@
 #include <typedefs.h>
 
-extern count_t cpu_count;
+extern size_t cpu_count;
 
 typedef struct {

kernel/arch/mips32/include/debugger.h

@@ -54 +54 @@
         unative_t nextinstruction;  /**< Original instruction following break */
         int flags;        /**< Flags regarding breakpoint */
-        count_t counter;
+        size_t counter;
         void (*bkfunc)(void *b, istate_t *istate);
 } bpinfo_t;

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

@@ -113 +113 @@
 /* Get PTE flags accessors for each level. */
 #define GET_PTL1_FLAGS_ARCH(ptl0, i) \
-        get_pt_flags((pte_t *) (ptl0), (index_t) (i))
+        get_pt_flags((pte_t *) (ptl0), (size_t) (i))
 #define GET_PTL2_FLAGS_ARCH(ptl1, i) \
         PAGE_PRESENT
@@ -119 +119 @@
         PAGE_PRESENT
 #define GET_FRAME_FLAGS_ARCH(ptl3, i) \
-        get_pt_flags((pte_t *) (ptl3), (index_t) (i))
+        get_pt_flags((pte_t *) (ptl3), (size_t) (i))
 
 /* Set PTE flags accessors for each level. */
 #define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \
-        set_pt_flags((pte_t *) (ptl0), (index_t) (i), (x))
+        set_pt_flags((pte_t *) (ptl0), (size_t) (i), (x))
 #define SET_PTL2_FLAGS_ARCH(ptl1, i, x)
 #define SET_PTL3_FLAGS_ARCH(ptl2, i, x)
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \
-        set_pt_flags((pte_t *) (ptl3), (index_t) (i), (x))
+        set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
 
 /* Last-level info macros. */
@@ -141 +141 @@
 #include <arch/exception.h>
 
-static inline int get_pt_flags(pte_t *pt, index_t i)
+static inline int get_pt_flags(pte_t *pt, size_t i)
 {
         pte_t *p = &pt[i];
@@ -154 +154 @@
 }
 
-static inline void set_pt_flags(pte_t *pt, index_t i, int flags)
+static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
         pte_t *p = &pt[i];

kernel/arch/mips32/include/types.h

@@ -47 +47 @@
 
 typedef uint32_t size_t;
-typedef uint32_t count_t;
-typedef uint32_t index_t;
 
 typedef uint32_t uintptr_t;
@@ -63 +61 @@
 #define PRIp "x"        /**< Format for uintptr_t. */
 #define PRIs "u"        /**< Format for size_t. */
-#define PRIc "u"        /**< Format for count_t. */
-#define PRIi "u"        /**< Format for index_t. */
 
 #define PRId8 "d"       /**< Format for int8_t. */