diff options
Diffstat (limited to 'sys/arch/m88k/include')
| -rw-r--r-- | sys/arch/m88k/include/asm_macro.h | 4 | ||||
| -rw-r--r-- | sys/arch/m88k/include/m88100.h | 6 | ||||
| -rw-r--r-- | sys/arch/m88k/include/pcb.h | 46 | ||||
| -rw-r--r-- | sys/arch/m88k/include/trap.h | 6 |
4 files changed, 31 insertions, 31 deletions
diff --git a/sys/arch/m88k/include/asm_macro.h b/sys/arch/m88k/include/asm_macro.h index 2ece4e147d1..7eff4f3d1bb 100644 --- a/sys/arch/m88k/include/asm_macro.h +++ b/sys/arch/m88k/include/asm_macro.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm_macro.h,v 1.3 2005/12/03 16:52:16 miod Exp $ */ +/* $OpenBSD: asm_macro.h,v 1.4 2007/11/17 05:36:23 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -66,7 +66,7 @@ static __inline__ u_int get_psr(void) /* * Provide access from C code to the assembly instruction ff1 */ -static __inline__ unsigned ff1(unsigned val) +static __inline__ u_int ff1(u_int val) { __asm__ __volatile__ ("ff1 %0, %0" : "=r" (val) : "0" (val)); return (val); diff --git a/sys/arch/m88k/include/m88100.h b/sys/arch/m88k/include/m88100.h index 53180beb2e2..ded8b635150 100644 --- a/sys/arch/m88k/include/m88100.h +++ b/sys/arch/m88k/include/m88100.h @@ -1,4 +1,4 @@ -/* $OpenBSD: m88100.h,v 1.3 2006/11/18 22:58:28 miod Exp $ */ +/* $OpenBSD: m88100.h,v 1.4 2007/11/17 05:36:23 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University @@ -58,8 +58,8 @@ #if defined(_KERNEL) && !defined(_LOCORE) -void dae_print(unsigned *); -void data_access_emulation(unsigned *); +void dae_print(u_int *); +void data_access_emulation(u_int *); u_int32_t do_load_word(vaddr_t, int); u_int16_t do_load_half(vaddr_t, int); diff --git a/sys/arch/m88k/include/pcb.h b/sys/arch/m88k/include/pcb.h index 7baa1e69bf8..f67c12022a5 100644 --- a/sys/arch/m88k/include/pcb.h +++ b/sys/arch/m88k/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.4 2007/01/13 22:00:56 miod Exp $ */ +/* $OpenBSD: pcb.h,v 1.5 2007/11/17 05:36:23 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Mach Operating System @@ -48,29 +48,29 @@ */ struct m88100_pcb { - unsigned pcb_pc; /* address to return */ - unsigned :32; - unsigned pcb_r14; - unsigned pcb_r15; - unsigned pcb_r16; - unsigned pcb_r17; - unsigned pcb_r18; - unsigned pcb_r19; - unsigned pcb_r20; - unsigned pcb_r21; - unsigned pcb_r22; - unsigned pcb_r23; - unsigned pcb_r24; - unsigned pcb_r25; - unsigned pcb_r26; - unsigned pcb_r27; - unsigned pcb_r28; - unsigned pcb_r29; - unsigned pcb_r30; - unsigned pcb_sp; /* kernel stack pointer */ + unsigned int pcb_pc; /* address to return */ + unsigned int :32; + unsigned int pcb_r14; + unsigned int pcb_r15; + unsigned int pcb_r16; + unsigned int pcb_r17; + unsigned int pcb_r18; + unsigned int pcb_r19; + unsigned int pcb_r20; + unsigned int pcb_r21; + unsigned int pcb_r22; + unsigned int pcb_r23; + unsigned int pcb_r24; + unsigned int pcb_r25; + unsigned int pcb_r26; + unsigned int pcb_r27; + unsigned int pcb_r28; + unsigned int pcb_r29; + unsigned int pcb_r30; + unsigned int pcb_sp; /* kernel stack pointer */ /* floating-point state */ - unsigned pcb_fcr62; - unsigned pcb_fcr63; + unsigned int pcb_fcr62; + unsigned int pcb_fcr63; }; struct pcb diff --git a/sys/arch/m88k/include/trap.h b/sys/arch/m88k/include/trap.h index 0fda5f005b3..e617c73d958 100644 --- a/sys/arch/m88k/include/trap.h +++ b/sys/arch/m88k/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.3 2006/05/08 14:03:34 miod Exp $ */ +/* $OpenBSD: trap.h,v 1.4 2007/11/17 05:36:23 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University @@ -61,9 +61,9 @@ #ifndef _LOCORE void cache_flush(struct trapframe *); void m88100_syscall(register_t, struct trapframe *); -void m88100_trap(unsigned, struct trapframe *); +void m88100_trap(u_int, struct trapframe *); void m88110_syscall(register_t, struct trapframe *); -void m88110_trap(unsigned, struct trapframe *); +void m88110_trap(u_int, struct trapframe *); #endif /* _LOCORE */ #endif /* __MACHINE_TRAP_H__ */ |