Changeset 98000fb in mainline for kernel/arch/ia32/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/ia32/include

Files:

• cpu.h (modified) (1 diff)
• mm/page.h (modified) (4 diffs)
• proc/task.h (modified) (1 diff)
• smp/smp.h (modified) (1 diff)
• types.h (modified) (2 diffs)

kernel/arch/ia32/include/cpu.h

@@ -58 +58 @@
         tss_t *tss;
         
-        count_t iomapver_copy;  /** Copy of TASK's I/O Permission bitmap generation count. */
+        size_t iomapver_copy;  /** Copy of TASK's I/O Permission bitmap generation count. */
 } cpu_arch_t;
 

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

@@ -96 +96 @@
 /* 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
@@ -102 +102 @@
         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))
 
 /* Macros for querying the last level entries. */
@@ -146 +146 @@
 #define PFERR_CODE_RSVD         (1 << 3)        
 
-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];
@@ -159 +159 @@
 }
 
-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/ia32/include/proc/task.h

@@ -41 +41 @@
 typedef struct {
         /** I/O Permission bitmap Generation counter. */
-        count_t iomapver;
+        size_t iomapver;
         /** I/O Permission bitmap. */
         bitmap_t iomap;

kernel/arch/ia32/include/smp/smp.h

@@ -40 +40 @@
 /** SMP config opertaions interface. */
 struct smp_config_operations {
-        count_t (* cpu_count)(void);            /**< Return number of detected processors. */
-        bool (* cpu_enabled)(index_t i);        /**< Check whether the processor of index i is enabled. */
-        bool (*cpu_bootstrap)(index_t i);       /**< Check whether the processor of index i is BSP. */
-        uint8_t (*cpu_apic_id)(index_t i);              /**< Return APIC ID of the processor of index i. */
+        size_t (* cpu_count)(void);             /**< Return number of detected processors. */
+        bool (* cpu_enabled)(size_t i); /**< Check whether the processor of index i is enabled. */
+        bool (*cpu_bootstrap)(size_t i);        /**< Check whether the processor of index i is BSP. */
+        uint8_t (*cpu_apic_id)(size_t i);               /**< Return APIC ID of the processor of index i. */
         int (*irq_to_pin)(unsigned int irq);            /**< Return mapping between irq and APIC pin. */
 };

kernel/arch/ia32/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. */