Changeset ffe276f in mainline for kernel/arch/ppc32/include


Ignore:
Timestamp:
2010-05-22T22:56:00Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c555155
Parents:
86a3f89b
Message:

restructure constants
change the return type of pic_get_pending()
coding style changes

Location:
kernel/arch/ppc32/include
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ppc32/include/asm.h

    r86a3f89b rffe276f  
    6060}
    6161
     62static inline uint32_t msr_read(void)
     63{
     64        uint32_t msr;
     65       
     66        asm volatile (
     67                "mfmsr %[msr]\n"
     68                : [msr] "=r" (msr)
     69        );
     70       
     71        return msr;
     72}
     73
     74static inline void msr_write(uint32_t msr)
     75{
     76        asm volatile (
     77                "mtmsr %[msr]\n"
     78                :: [msr] "r" (msr)
     79        );
     80}
     81
    6282/** Enable interrupts.
    6383 *

  • kernel/arch/ppc32/include/asm/regname.h

    r86a3f89b rffe276f  
    217217#define hid0     1008
    218218
    219 /* MSR bits */
    220 #define msr_dr  (1 << 4)
    221 #define msr_ir  (1 << 5)
    222 #define msr_pr  (1 << 14)
    223 #define msr_ee  (1 << 15)
    224 
    225 /* HID0 bits */
    226 #define hid0_sten  (1 << 24)
    227 #define hid0_ice   (1 << 15)
    228 #define hid0_dce   (1 << 14)
    229 #define hid0_icfi  (1 << 11)
    230 #define hid0_dci   (1 << 10)
    231 
    232219#endif
    233220

  • kernel/arch/ppc32/include/drivers/pic.h

    r86a3f89b rffe276f  
    3939#include <ddi/irq.h>
    4040
    41 #define PIC_PENDING_LOW    8
    42 #define PIC_PENDING_HIGH   4
    43 #define PIC_MASK_LOW       9
    44 #define PIC_MASK_HIGH      5
    45 #define PIC_ACK_LOW        10
    46 #define PIC_ACK_HIGH       6
     41#define PIC_PENDING_LOW   8
     42#define PIC_PENDING_HIGH  4
     43#define PIC_MASK_LOW      9
     44#define PIC_MASK_HIGH     5
     45#define PIC_ACK_LOW       10
     46#define PIC_ACK_HIGH      6
    4747
    48 extern void pic_init(uintptr_t base, size_t size, cir_t *cir, void **cir_arg);
    49 extern void pic_enable_interrupt(inr_t intnum);
    50 extern void pic_disable_interrupt(inr_t intnum);
    51 extern void pic_ack_interrupt(void *arg, inr_t intnum);
    52 extern int pic_get_pending(void);
     48extern void pic_init(uintptr_t, size_t, cir_t *, void **);
     49extern void pic_enable_interrupt(inr_t);
     50extern void pic_disable_interrupt(inr_t);
     51extern void pic_ack_interrupt(void *, inr_t);
     52extern uint8_t pic_get_pending(void);
    5353
    5454#endif

  • kernel/arch/ppc32/include/exception.h

    r86a3f89b rffe276f  
    2727 */
    2828
    29 /** @addtogroup ppc32   
     29/** @addtogroup ppc32
    3030 * @{
    3131 */
    … …  
    3737
    3838#include <typedefs.h>
    39 #include <arch/regutils.h>
     39#include <arch/cpu.h>
    4040
    4141typedef struct istate {
    … …  
    8686}
    8787
    88 /** Return true if exception happened while in userspace */
     88/** Return true if exception happened while in userspace
     89 *
     90 * The contexts of MSR register was stored in SRR1.
     91 *
     92 */
    8993static inline int istate_from_uspace(istate_t *istate)
    9094{
    91         /* true if privilege level PR (copied from MSR) == 1 */
    9295        return (istate->srr1 & MSR_PR) != 0;
    9396}
Note: See TracChangeset for help on using the changeset viewer.