Changeset 7f1c620 in mainline for arch/amd64/include/interrupt.h


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • arch/amd64/include/interrupt.h

    r991779c5 r7f1c620  
    7171/** This is passed to interrupt handlers */
    7272struct istate {
    73         __u64 rax;
    74         __u64 rbx;
    75         __u64 rcx;
    76         __u64 rdx;
    77         __u64 rsi;
    78         __u64 rdi;
    79         __u64 r8;
    80         __u64 r9;
    81         __u64 r10;
    82         __u64 r11;
    83         __u64 r12;
    84         __u64 r13;
    85         __u64 r14;
    86         __u64 r15;
    87         __u64 rbp;
    88         __u64 error_word;
    89         __u64 rip;
    90         __u64 cs;
    91         __u64 rflags;
    92         __u64 stack[]; /* Additional data on stack */
     73        uint64_t rax;
     74        uint64_t rbx;
     75        uint64_t rcx;
     76        uint64_t rdx;
     77        uint64_t rsi;
     78        uint64_t rdi;
     79        uint64_t r8;
     80        uint64_t r9;
     81        uint64_t r10;
     82        uint64_t r11;
     83        uint64_t r12;
     84        uint64_t r13;
     85        uint64_t r14;
     86        uint64_t r15;
     87        uint64_t rbp;
     88        uint64_t error_word;
     89        uint64_t rip;
     90        uint64_t cs;
     91        uint64_t rflags;
     92        uint64_t stack[]; /* Additional data on stack */
    9393};
    9494
    … …  
    9999}
    100100
    101 static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
     101static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
    102102{
    103103        istate->rip = retaddr;
    104104}
    105 static inline __native istate_get_pc(istate_t *istate)
     105static inline unative_t istate_get_pc(istate_t *istate)
    106106{
    107107        return istate->rip;
    108108}
    109109
    110 extern void (* disable_irqs_function)(__u16 irqmask);
    111 extern void (* enable_irqs_function)(__u16 irqmask);
     110extern void (* disable_irqs_function)(uint16_t irqmask);
     111extern void (* enable_irqs_function)(uint16_t irqmask);
    112112extern void (* eoi_function)(void);
    113113
    … …  
    121121extern void tlb_shootdown_ipi(int n, istate_t *istate);
    122122
    123 extern void trap_virtual_enable_irqs(__u16 irqmask);
    124 extern void trap_virtual_disable_irqs(__u16 irqmask);
     123extern void trap_virtual_enable_irqs(uint16_t irqmask);
     124extern void trap_virtual_disable_irqs(uint16_t irqmask);
    125125extern void trap_virtual_eoi(void);
    126126/* AMD64 - specific page handler */
Note: See TracChangeset for help on using the changeset viewer.