Changeset 98000fb in mainline for kernel/arch/ia32


Ignore:
Timestamp:
2009-06-03T19:34:45Z (17 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
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia32/include/cpu.h

    r69e68e3 r98000fb  
    5858        tss_t *tss;
    5959       
    60         count_t iomapver_copy;  /** Copy of TASK's I/O Permission bitmap generation count. */
     60        size_t iomapver_copy;  /** Copy of TASK's I/O Permission bitmap generation count. */
    6161} cpu_arch_t;
    6262

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

    r69e68e3 r98000fb  
    9696/* Get PTE flags accessors for each level. */
    9797#define GET_PTL1_FLAGS_ARCH(ptl0, i) \
    98         get_pt_flags((pte_t *) (ptl0), (index_t) (i))
     98        get_pt_flags((pte_t *) (ptl0), (size_t) (i))
    9999#define GET_PTL2_FLAGS_ARCH(ptl1, i) \
    100100        PAGE_PRESENT
    … …  
    102102        PAGE_PRESENT
    103103#define GET_FRAME_FLAGS_ARCH(ptl3, i) \
    104         get_pt_flags((pte_t *) (ptl3), (index_t) (i))
     104        get_pt_flags((pte_t *) (ptl3), (size_t) (i))
    105105
    106106/* Set PTE flags accessors for each level. */
    107107#define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \
    108         set_pt_flags((pte_t *) (ptl0), (index_t) (i), (x))
     108        set_pt_flags((pte_t *) (ptl0), (size_t) (i), (x))
    109109#define SET_PTL2_FLAGS_ARCH(ptl1, i, x)
    110110#define SET_PTL3_FLAGS_ARCH(ptl2, i, x)
    111111#define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \
    112         set_pt_flags((pte_t *) (ptl3), (index_t) (i), (x))
     112        set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
    113113
    114114/* Macros for querying the last level entries. */
    … …  
    146146#define PFERR_CODE_RSVD         (1 << 3)       
    147147
    148 static inline int get_pt_flags(pte_t *pt, index_t i)
     148static inline int get_pt_flags(pte_t *pt, size_t i)
    149149{
    150150        pte_t *p = &pt[i];
    … …  
    159159}
    160160
    161 static inline void set_pt_flags(pte_t *pt, index_t i, int flags)
     161static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
    162162{
    163163        pte_t *p = &pt[i];

  • kernel/arch/ia32/include/proc/task.h

    r69e68e3 r98000fb  
    4141typedef struct {
    4242        /** I/O Permission bitmap Generation counter. */
    43         count_t iomapver;
     43        size_t iomapver;
    4444        /** I/O Permission bitmap. */
    4545        bitmap_t iomap;

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

    r69e68e3 r98000fb  
    4040/** SMP config opertaions interface. */
    4141struct smp_config_operations {
    42         count_t (* cpu_count)(void);            /**< Return number of detected processors. */
    43         bool (* cpu_enabled)(index_t i);        /**< Check whether the processor of index i is enabled. */
    44         bool (*cpu_bootstrap)(index_t i);       /**< Check whether the processor of index i is BSP. */
    45         uint8_t (*cpu_apic_id)(index_t i);              /**< Return APIC ID of the processor of index i. */
     42        size_t (* cpu_count)(void);             /**< Return number of detected processors. */
     43        bool (* cpu_enabled)(size_t i); /**< Check whether the processor of index i is enabled. */
     44        bool (*cpu_bootstrap)(size_t i);        /**< Check whether the processor of index i is BSP. */
     45        uint8_t (*cpu_apic_id)(size_t i);               /**< Return APIC ID of the processor of index i. */
    4646        int (*irq_to_pin)(unsigned int irq);            /**< Return mapping between irq and APIC pin. */
    4747};

  • kernel/arch/ia32/include/types.h

    r69e68e3 r98000fb  
    4747
    4848typedef uint32_t size_t;
    49 typedef uint32_t count_t;
    50 typedef uint32_t index_t;
    5149
    5250typedef uint32_t uintptr_t;
    … …  
    6361#define PRIp "x"        /**< Format for uintptr_t. */
    6462#define PRIs "u"        /**< Format for size_t. */
    65 #define PRIc "u"        /**< Format for count_t. */
    66 #define PRIi "u"        /**< Format for index_t. */
    6763
    6864#define PRId8 "d"       /**< Format for int8_t. */

  • kernel/arch/ia32/src/ddi/ddi.c

    r69e68e3 r98000fb  
    5858int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
    5959{
    60         count_t bits;
     60        size_t bits;
    6161
    6262        bits = ioaddr + size;
    … …  
    100100         * Enable the range and we are done.
    101101         */
    102         bitmap_clear_range(&task->arch.iomap, (index_t) ioaddr, (count_t) size);
     102        bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, (size_t) size);
    103103
    104104        /*
    … …  
    119119void io_perm_bitmap_install(void)
    120120{
    121         count_t bits;
     121        size_t bits;
    122122        ptr_16_32_t cpugdtr;
    123123        descriptor_t *gdt_p;
    124         count_t ver;
     124        size_t ver;
    125125
    126126        /* First, copy the I/O Permission Bitmap. */

  • kernel/arch/ia32/src/interrupt.c

    r69e68e3 r98000fb  
    102102{
    103103        if (TASK) {
    104                 count_t ver;
     104                size_t ver;
    105105               
    106106                spinlock_lock(&TASK->lock);

  • kernel/arch/ia32/src/mm/frame.c

    r69e68e3 r98000fb  
    7171#endif
    7272                pfn_t pfn;
    73                 count_t count;
     73                size_t count;
    7474               
    7575                if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {

  • kernel/arch/ia32/src/mm/tlb.c

    r69e68e3 r98000fb  
    6060 * @param cnt Number of entries to invalidate.
    6161 */
    62 void tlb_invalidate_pages(asid_t asid __attribute__((unused)), uintptr_t page, count_t cnt)
     62void tlb_invalidate_pages(asid_t asid __attribute__((unused)), uintptr_t page, size_t cnt)
    6363{
    6464        unsigned int i;

  • kernel/arch/ia32/src/smp/mps.c

    r69e68e3 r98000fb  
    8787 * Implementation of IA-32 SMP configuration interface.
    8888 */
    89 static count_t get_cpu_count(void);
    90 static bool is_cpu_enabled(index_t i);
    91 static bool is_bsp(index_t i);
    92 static uint8_t get_cpu_apic_id(index_t i);
     89static size_t get_cpu_count(void);
     90static bool is_cpu_enabled(size_t i);
     91static bool is_bsp(size_t i);
     92static uint8_t get_cpu_apic_id(size_t i);
    9393static int mps_irq_to_pin(unsigned int irq);
    9494
    … …  
    101101};
    102102
    103 count_t get_cpu_count(void)
     103size_t get_cpu_count(void)
    104104{
    105105        return processor_entry_cnt;
    106106}
    107107
    108 bool is_cpu_enabled(index_t i)
     108bool is_cpu_enabled(size_t i)
    109109{
    110110        ASSERT(i < processor_entry_cnt);
    … …  
    112112}
    113113
    114 bool is_bsp(index_t i)
     114bool is_bsp(size_t i)
    115115{
    116116        ASSERT(i < processor_entry_cnt);
    … …  
    118118}
    119119
    120 uint8_t get_cpu_apic_id(index_t i)
     120uint8_t get_cpu_apic_id(size_t i)
    121121{
    122122        ASSERT(i < processor_entry_cnt);
Note: See TracChangeset for help on using the changeset viewer.