diff options
| author | Steve Murphree <smurph@cvs.openbsd.org> | 2001-01-14 20:25:26 +0000 |
|---|---|---|
| committer | Steve Murphree <smurph@cvs.openbsd.org> | 2001-01-14 20:25:26 +0000 |
| commit | d468113ddc0c5ba8e16ecb9db979c3b98e031714 (patch) | |
| tree | 7cdff44637fd7b9f5d0f433cdfd94a1a0e4fc6ea /sys/arch/mvme88k/include | |
| parent | 9e571f43f415bf69545d34b77b15070b97bd0397 (diff) | |
Complete move to UVM virtual memory system. More header fixes.
Diffstat (limited to 'sys/arch/mvme88k/include')
33 files changed, 143 insertions, 109 deletions
diff --git a/sys/arch/mvme88k/include/ansi.h b/sys/arch/mvme88k/include/ansi.h index c2e2c3ac2db..13cb418602a 100644 --- a/sys/arch/mvme88k/include/ansi.h +++ b/sys/arch/mvme88k/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.9 2000/03/03 00:54:53 todd Exp $ */ +/* $OpenBSD: ansi.h,v 1.10 2001/01/14 20:25:23 smurph Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -34,8 +34,8 @@ * from: @(#)ansi.h 8.2 (Berkeley) 1/4/94 */ -#ifndef _ANSI_H_ -#define _ANSI_H_ +#ifndef __MACHINE_ANSI_H__ +#define __MACHINE_ANSI_H__ /* * Types which are fundamental to the implementation and may appear in @@ -85,4 +85,4 @@ */ #define _BSD_OFF_T_ long long /* file offset */ -#endif /* _ANSI_H_ */ +#endif __MACHINE_ANSI_H__ diff --git a/sys/arch/mvme88k/include/asm.h b/sys/arch/mvme88k/include/asm.h index 60e4b5ae9bb..a72fcdaf82f 100644 --- a/sys/arch/mvme88k/include/asm.h +++ b/sys/arch/mvme88k/include/asm.h @@ -25,8 +25,8 @@ * rights to redistribute these changes. */ -#ifndef __M88K_ASM_H__ -#define __M88K_ASM_H__ +#ifndef __MACHINE_M88K_ASM_H__ +#define __MACHINE_M88K_ASM_H__ #ifdef __STDC__ # define FUNC(NAME) _##NAME @@ -324,4 +324,4 @@ #define VME_CMMU_D3 0xFFF7F000 /* MVME188 data CMMU 3 */ #endif /* CMMU_DEFS */ -#endif /* __M88K_ASM_H__ */ +#endif __MACHINE_M88K_ASM_H__ diff --git a/sys/arch/mvme88k/include/asm_macro.h b/sys/arch/mvme88k/include/asm_macro.h index 385ce20475d..522db6e0e85 100644 --- a/sys/arch/mvme88k/include/asm_macro.h +++ b/sys/arch/mvme88k/include/asm_macro.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm_macro.h,v 1.6 1999/09/27 20:46:16 smurph Exp $ */ +/* $OpenBSD: asm_macro.h,v 1.7 2001/01/14 20:25:23 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -26,8 +26,8 @@ * rights to redistribute these changes. */ -#ifndef __M88K_ASM_MACRO_H__ -#define __M88K_ASM_MACRO_H__ +#ifndef __MACHINE_M88K_ASM_MACRO_H__ +#define __MACHINE_M88K_ASM_MACRO_H__ /* ** Various compiler macros used for speed and efficiency. @@ -101,4 +101,4 @@ static inline void flush_pipeline() } #define db_flush_pipeline flush_pipeline -#endif /* __M88K_ASM_MACRO_H__ */ +#endif __MACHINE_M88K_ASM_MACRO_H__ diff --git a/sys/arch/mvme88k/include/assert.h b/sys/arch/mvme88k/include/assert.h index fcdbab19465..7d7568de671 100644 --- a/sys/arch/mvme88k/include/assert.h +++ b/sys/arch/mvme88k/include/assert.h @@ -1,4 +1,6 @@ -/* $OpenBSD: assert.h,v 1.4 1999/02/09 06:36:25 smurph Exp $ */ +/* $OpenBSD: assert.h,v 1.5 2001/01/14 20:25:23 smurph Exp $ */ +#ifndef __MACHINE_ASSERT_H__ +#define __MACHINE_ASSERT_H__ #define assert(x) \ ({\ if (!(x)) {\ @@ -7,3 +9,4 @@ panic("assertion"); \ } \ }) +#endif __MACHINE_ASSERT_H__ diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h index 8ac89b00195..7890c04b7f5 100644 --- a/sys/arch/mvme88k/include/board.h +++ b/sys/arch/mvme88k/include/board.h @@ -1,4 +1,4 @@ -/* $OpenBSD: board.h,v 1.6 1999/09/27 20:46:17 smurph Exp $ */ +/* $OpenBSD: board.h,v 1.7 2001/01/14 20:25:23 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -42,8 +42,8 @@ * thereof, and that both notices appear in supporting documentation. * */ -#ifndef _MACHINE_BOARD_H -#define _MACHINE_BOARD_H +#ifndef __MACHINE_BOARD_H__ +#define __MACHINE_BOARD_H__ /* * VME187 CPU board constants - derived from Luna88k */ @@ -118,6 +118,6 @@ #include <machine/mvme188.h> #endif -#endif /* _MACHINE_BOARD_H */ +#endif __MACHINE_BOARD_H__ diff --git a/sys/arch/mvme88k/include/bug.h b/sys/arch/mvme88k/include/bug.h index fe7e392948a..c13c6527f62 100644 --- a/sys/arch/mvme88k/include/bug.h +++ b/sys/arch/mvme88k/include/bug.h @@ -1,4 +1,6 @@ -/* $OpenBSD: bug.h,v 1.4 1999/02/09 06:36:25 smurph Exp $ */ +/* $OpenBSD: bug.h,v 1.5 2001/01/14 20:25:23 smurph Exp $ */ +#ifndef __MACHINE_BUG_H__ +#define __MACHINE_BUG_H__ #include <machine/bugio.h> struct bugenv { @@ -11,3 +13,4 @@ struct bugenv { char *argstart; char *argend; }; +#endif __MACHINE_BUG_H__ diff --git a/sys/arch/mvme88k/include/bugio.h b/sys/arch/mvme88k/include/bugio.h index da2d1a7dbef..8c196174930 100644 --- a/sys/arch/mvme88k/include/bugio.h +++ b/sys/arch/mvme88k/include/bugio.h @@ -1,4 +1,6 @@ -/* $OpenBSD: bugio.h,v 1.6 1999/04/11 03:26:28 smurph Exp $ */ +/* $OpenBSD: bugio.h,v 1.7 2001/01/14 20:25:23 smurph Exp $ */ +#ifndef __MACHINE_BUGIO_H__ +#define __MACHINE_BUGIO_H__ #include "sys/cdefs.h" struct bugdisk_io { @@ -94,3 +96,5 @@ int bugrtcrd __P((struct bugrtc *)); int bugreturn __P((void)); int bugbrdid __P((struct bugbrdid *)); int bugnetctrl __P((struct bugniocall *)); +#endif __MACHINE_BUGIO_H__ + diff --git a/sys/arch/mvme88k/include/cdefs.h b/sys/arch/mvme88k/include/cdefs.h index 6b6bc88ea82..ffd48ba3a8d 100644 --- a/sys/arch/mvme88k/include/cdefs.h +++ b/sys/arch/mvme88k/include/cdefs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cdefs.h,v 1.5 1999/02/09 06:36:26 smurph Exp $ */ +/* $OpenBSD: cdefs.h,v 1.6 2001/01/14 20:25:23 smurph Exp $ */ /* $NetBSD: cdefs.h,v 1.2 1995/03/23 20:10:48 jtc Exp $ */ /* @@ -6,8 +6,8 @@ * Public domain. */ -#ifndef _MACHINE_CDEFS_H_ -#define _MACHINE_CDEFS_H_ +#ifndef __MACHINE_CDEFS_H__ +#define __MACHINE_CDEFS_H__ #ifdef __STDC__ #define _C_LABEL(x) _STRING(_ ## x) @@ -33,4 +33,4 @@ #endif #endif -#endif /* !_MACHINE_CDEFS_H_ */ +#endif __MACHINE_CDEFS_H__ diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h index d2146c1156b..40105299fe1 100644 --- a/sys/arch/mvme88k/include/cpu.h +++ b/sys/arch/mvme88k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.6 1999/09/27 20:46:17 smurph Exp $ */ +/* $OpenBSD: cpu.h,v 1.7 2001/01/14 20:25:23 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -42,8 +42,8 @@ * SUCH DAMAGE. */ -#ifndef _CPU_H_ -#define _CPU_H_ +#ifndef __MACHINE_CPU_H__ +#define __MACHINE_CPU_H__ /* * CTL_MACHDEP definitinos. @@ -194,4 +194,4 @@ struct funcp { extern struct funcp mdfp; #endif /* _KERNEL */ -#endif /* _CPU_H_ */ +#endif __MACHINE_CPU_H__ diff --git a/sys/arch/mvme88k/include/cpu_number.h b/sys/arch/mvme88k/include/cpu_number.h index e26ddfe6eb4..b72b79ca210 100644 --- a/sys/arch/mvme88k/include/cpu_number.h +++ b/sys/arch/mvme88k/include/cpu_number.h @@ -28,21 +28,20 @@ #define _M88K_CPU_NUMBER_ #ifdef KERNEL +#ifndef ASSEMBLER #include <machine/param.h> extern unsigned number_cpus; -#define cpu_number() 0 -#if 0 /* This seems to not work correctly. Hmm.... smurph */ -unsigned cpu_number(void); -static inline unsigned cpu_number(void) +static __inline__ unsigned cpu_number(void); + +static __inline__ unsigned cpu_number(void) { - unsigned cpu; - extern int cputyp; + register unsigned cpu; + extern int cputyp; if (cputyp != CPU_188 || number_cpus == 1) return 0; - asm("ldcr %0, cr18" : "=r" (cpu)); - asm("clr %0, %0, 0<4>" : "=r" (cpu)); + asm("ldcr %0, cr18" : "=r" (cpu)); return (cpu & 3); } -#endif /* 0 */ +#endif /* ASSEMBLER */ #endif /* KERNEL */ #endif /* _M88K_CPU_NUMBER_ */ diff --git a/sys/arch/mvme88k/include/cpus.h b/sys/arch/mvme88k/include/cpus.h index d41e7211469..658308f33b8 100644 --- a/sys/arch/mvme88k/include/cpus.h +++ b/sys/arch/mvme88k/include/cpus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpus.h,v 1.5 1999/09/27 20:46:17 smurph Exp $ */ +/* $OpenBSD: cpus.h,v 1.6 2001/01/14 20:25:23 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University @@ -32,8 +32,8 @@ Versions Idents for 88k family chips */ -#ifndef _M88K_CPUS_ -#define _M88K_CPUS_ +#ifndef __MACHINE_CPUS_H__ +#define __MACHINE_CPUS_H__ /* * cpu Processor Identification Register (PID). @@ -62,4 +62,4 @@ union cpupid { #define M88200 5 #define M88204 6 -#endif _M88K_CPUS_ +#endif __MACHINE_CPUS_H__ diff --git a/sys/arch/mvme88k/include/disklabel.h b/sys/arch/mvme88k/include/disklabel.h index 2d9dba98585..2f1427a8eba 100644 --- a/sys/arch/mvme88k/include/disklabel.h +++ b/sys/arch/mvme88k/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.5 2000/04/07 13:39:02 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.6 2001/01/14 20:25:23 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1995 Dale Rahn. @@ -30,8 +30,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MACHINE_DISKLABEL_H_ -#define _MACHINE_DISKLABEL_H_ +#ifndef __MACHINE_DISKLABEL_H__ +#define __MACHINE_DISKLABEL_H__ /* number of boot pieces , ie xxboot bootxx */ #define NUMBOOT 2 @@ -132,4 +132,4 @@ struct cpu_disklabel { u_long magic2; u_char cfg_4[192]; }; -#endif _MACHINE_DISKLABEL_H_ +#endif __MACHINE_DISKLABEL_H__ diff --git a/sys/arch/mvme88k/include/endian.h b/sys/arch/mvme88k/include/endian.h index b778f03ca3e..b565cad78d9 100644 --- a/sys/arch/mvme88k/include/endian.h +++ b/sys/arch/mvme88k/include/endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: endian.h,v 1.9 1999/05/10 16:02:13 espie Exp $ */ +/* $OpenBSD: endian.h,v 1.10 2001/01/14 20:25:23 smurph Exp $ */ /*- * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. @@ -29,10 +29,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MVME88K_ENDIAN_H_ -#define _MVME88K_ENDIAN_H_ +#ifndef __MVME88K_ENDIAN_H__ +#define __MVME88K_ENDIAN_H__ #define BYTE_ORDER BIG_ENDIAN #include <sys/endian.h> -#endif /* _MVME88K_ENDIAN_H_ */ +#endif __MVME88K_ENDIAN_H__ + diff --git a/sys/arch/mvme88k/include/exception_vectors.h b/sys/arch/mvme88k/include/exception_vectors.h index 29a2f4fe731..4dd65941e46 100644 --- a/sys/arch/mvme88k/include/exception_vectors.h +++ b/sys/arch/mvme88k/include/exception_vectors.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exception_vectors.h,v 1.6 1999/09/27 20:46:17 smurph Exp $ */ +/* $OpenBSD: exception_vectors.h,v 1.7 2001/01/14 20:25:23 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1991, 1992 Carnegie Mellon University @@ -25,6 +25,8 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ +#ifndef __MACHINE_EXECPTION_VECTORS_H__ +#define __MACHINE_EXECPTION_VECTORS_H__ #define UNDEFINED PREDEFINED_BY_ROM #ifndef UNDEFINED @@ -167,4 +169,4 @@ /* vector 0x85 (#133) */ word user_raw_putstr /* for USER raw_printf() */ /* vector 0x85 (#134) */ word user_raw_xpr /* for USER raw_xpr() */ #endif - +#endif __MACHINE_EXECPTION_VECTORS_H__ diff --git a/sys/arch/mvme88k/include/exception_vectors2.h b/sys/arch/mvme88k/include/exception_vectors2.h index 6cc623cd816..8a03127b5e8 100644 --- a/sys/arch/mvme88k/include/exception_vectors2.h +++ b/sys/arch/mvme88k/include/exception_vectors2.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exception_vectors2.h,v 1.1 1999/09/27 20:46:17 smurph Exp $ */ +/* $OpenBSD: exception_vectors2.h,v 1.2 2001/01/14 20:25:24 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1991, 1992 Carnegie Mellon University @@ -26,6 +26,8 @@ * rights to redistribute these changes. */ /*#define M197_UNDEFINED PREDEFINED_BY_ROM*/ +#ifndef __MACHINE_EXECPTION_VECTORS2_H__ +#define __MACHINE_EXECPTION_VECTORS2_H__ #ifndef M197_M197_UNDEFINED #define M197_UNDEFINED _m197_unknown_handler #endif @@ -162,4 +164,4 @@ /* vector 0x82 (#130) */ word _m197_break /* vector 0x83 (#131) */ word _m197_trace /* vector 0x84 (#132) */ word _m197_entry - +#endif __MACHINE_EXECPTION_VECTORS2_H__ diff --git a/sys/arch/mvme88k/include/exec.h b/sys/arch/mvme88k/include/exec.h index f599b77eb16..8adb5fc2072 100644 --- a/sys/arch/mvme88k/include/exec.h +++ b/sys/arch/mvme88k/include/exec.h @@ -1,6 +1,6 @@ -/* $OpenBSD: exec.h,v 1.7 1999/05/29 04:41:45 smurph Exp $ */ -#ifndef _MACHINE_EXEC_H_ -#define _MACHINE_EXEC_H_ +/* $OpenBSD: exec.h,v 1.8 2001/01/14 20:25:24 smurph Exp $ */ +#ifndef __MACHINE_EXEC_H__ +#define __MACHINE_EXEC_H__ #define __LDPGSZ 4096 @@ -27,4 +27,4 @@ struct relocation_info_m88k { #define _KERN_DO_AOUT #define _KERN_DO_ELF -#endif _MACHINE_EXEC_H_ +#endif __MACHINE_EXEC_H__ diff --git a/sys/arch/mvme88k/include/float.h b/sys/arch/mvme88k/include/float.h index 61c2fb97bef..cd67401ef77 100644 --- a/sys/arch/mvme88k/include/float.h +++ b/sys/arch/mvme88k/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.3 1999/02/09 06:36:26 smurph Exp $ */ +/* $OpenBSD: float.h,v 1.4 2001/01/14 20:25:24 smurph Exp $ */ /* * Copyright (c) 1989 Regents of the University of California. @@ -35,8 +35,8 @@ * @(#)float.h 7.1 (Berkeley) 5/8/90 */ -#ifndef _M88K_FLOAT_H_ -#define _M88K_FLOAT_H_ +#ifndef __M88K_FLOAT_H__ +#define __M88K_FLOAT_H__ #include <sys/cdefs.h> @@ -77,4 +77,4 @@ __END_DECLS #define LDBL_MAX DBL_MAX #define LDBL_MAX_10_EXP DBL_MAX_10_EXP -#endif /* !_M88K_FLOAT_H_ */ +#endif __M88K_FLOAT_H__ diff --git a/sys/arch/mvme88k/include/ieee.h b/sys/arch/mvme88k/include/ieee.h index 8dab48a930e..a4801ecd5b2 100644 --- a/sys/arch/mvme88k/include/ieee.h +++ b/sys/arch/mvme88k/include/ieee.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee.h,v 1.2 1999/02/09 06:36:26 smurph Exp $ */ +/* $OpenBSD: ieee.h,v 1.3 2001/01/14 20:25:24 smurph Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -80,6 +80,8 @@ * * -149 == -127 - 23 + 1. */ +#ifndef __MACHINE_IEEE_H__ +#define __MACHINE_IEEE_H__ #define SNG_EXPBITS 8 #define SNG_FRACBITS 23 @@ -141,3 +143,4 @@ struct ieee_ext { #define SNG_EXP_BIAS 127 #define DBL_EXP_BIAS 1023 #define EXT_EXP_BIAS 16383 +#endif __MACHINE_IEEE_H__ diff --git a/sys/arch/mvme88k/include/m88100.h b/sys/arch/mvme88k/include/m88100.h index c29497bab98..88739cbc908 100644 --- a/sys/arch/mvme88k/include/m88100.h +++ b/sys/arch/mvme88k/include/m88100.h @@ -1,4 +1,4 @@ -/* $OpenBSD: m88100.h,v 1.4 1999/02/09 06:36:26 smurph Exp $ */ +/* $OpenBSD: m88100.h,v 1.5 2001/01/14 20:25:24 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University @@ -31,8 +31,8 @@ * M88100 flags */ -#ifndef _M88100_H_ -#define _M88100_H_ +#ifndef __MACHINE_M88100_H__ +#define __MACHINE_M88100_H__ /* @@ -67,4 +67,4 @@ struct dmt_reg { }; #endif -#endif _M88100_H_ +#endif __MACHINE_M88100_H__ diff --git a/sys/arch/mvme88k/include/m88110.h b/sys/arch/mvme88k/include/m88110.h index 9d15b060fc0..21f96cbf894 100644 --- a/sys/arch/mvme88k/include/m88110.h +++ b/sys/arch/mvme88k/include/m88110.h @@ -1,4 +1,4 @@ -/* $OpenBSD: m88110.h,v 1.1 1999/09/27 20:46:18 smurph Exp $ */ +/* $OpenBSD: m88110.h,v 1.2 2001/01/14 20:25:24 smurph Exp $ */ #ifndef __MACHINE_M88110_H__ #define __MACHINE_M88110_H__ @@ -226,4 +226,4 @@ unsigned get_dpar (void); #endif /* ASSEMBLER */ -#endif /* __MACHINE_M88110_H__ */ +#endif __MACHINE_M88110_H__ diff --git a/sys/arch/mvme88k/include/mmu.h b/sys/arch/mvme88k/include/mmu.h index ae9f453dc20..0a6bef314c4 100644 --- a/sys/arch/mvme88k/include/mmu.h +++ b/sys/arch/mvme88k/include/mmu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mmu.h,v 1.5 2001/01/13 05:18:59 smurph Exp $ */ +/* $OpenBSD: mmu.h,v 1.6 2001/01/14 20:25:24 smurph Exp $ */ /* * Ashura Project */ @@ -9,8 +9,8 @@ * @(#)mmu.h 1.22 90/09/20 19:13:34 */ -#ifndef _MACHINE_MMU_ -#define _MACHINE_MMU_ +#ifndef __MACHINE_MMU_H__ +#define __MACHINE_MMU_H__ /* for m88k_pgbytes, m8kk_pgshift */ #include <machine/vmparam.h> @@ -314,5 +314,5 @@ extern vm_offset_t kmapva; #define DMA_CACHE_INV 0x3 extern void dma_cachectl(vm_offset_t, int, int); -#endif -/* endif _MACHINE_MMU_ */ +#endif __MACHINE_MMU_H__ + diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h index e64198e232f..3bb14c0ff5e 100644 --- a/sys/arch/mvme88k/include/mvme188.h +++ b/sys/arch/mvme88k/include/mvme188.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mvme188.h,v 1.1 1999/09/27 20:46:18 smurph Exp $ */ +/* $OpenBSD: mvme188.h,v 1.2 2001/01/14 20:25:24 smurph Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -43,8 +43,8 @@ * */ -#ifndef _MACHINE_MVME188_H -#define _MACHINE_MVME188_H +#ifndef __MACHINE_MVME188_H__ +#define __MACHINE_MVME188_H__ /* * Something to put append a 'U' to a long constant if it's C so that @@ -394,6 +394,6 @@ void unblock_obio_interrupt(unsigned mask); #endif #define M188_IACK U(0xFFF85000) -#endif /* _MACHINE_MVME188_H */ +#endif __MACHINE_MVME188_H__ diff --git a/sys/arch/mvme88k/include/mvme1x7.h b/sys/arch/mvme88k/include/mvme1x7.h index d65d59726c2..c296c59bb98 100644 --- a/sys/arch/mvme88k/include/mvme1x7.h +++ b/sys/arch/mvme88k/include/mvme1x7.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mvme1x7.h,v 1.1 1999/09/27 20:46:18 smurph Exp $ */ +/* $OpenBSD: mvme1x7.h,v 1.2 2001/01/14 20:25:24 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1999 Steve Murphree, Jr. @@ -43,8 +43,8 @@ * thereof, and that both notices appear in supporting documentation. * */ -#ifndef _MACHINE_MVME1X7_H -#define _MACHINE_MVME1X7_H +#ifndef __MACHINE_MVME1X7_H__ +#define __MACHINE_MVME1X7_H__ /* * VME1x7 CPU board constants - derived from Luna88k */ @@ -100,6 +100,4 @@ #define M187_IACK U(0xFFFE0000) #define M197_IACK U(0xFFF00100) -#endif /* _MACHINE_MVME1X7_H */ - - +#endif __MACHINE_MVME1X7_H__ diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h index 20de45cd71c..fb169df5b33 100644 --- a/sys/arch/mvme88k/include/param.h +++ b/sys/arch/mvme88k/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.11 2000/02/22 19:27:55 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.12 2001/01/14 20:25:24 smurph Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1988 University of Utah. @@ -40,7 +40,7 @@ * from: Utah $Hdr: machparam.h 1.11 89/08/14$ * * @(#)param.h 7.8 (Berkeley) 6/28/91 - * $Id: param.h,v 1.11 2000/02/22 19:27:55 deraadt Exp $ + * $Id: param.h,v 1.12 2001/01/14 20:25:24 smurph Exp $ */ #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ @@ -114,10 +114,11 @@ * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple * of the hardware page size. */ -#define MSIZE 128 /* size of an mbuf */ -#define MCLBYTES 1024 -#define MCLSHIFT 10 -#define MCLOFSET (MCLBYTES - 1) +#define MSIZE 128 /* size of an mbuf */ +#define MCLSHIFT 11 /* convert bytes to m_buf clusters */ +#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ +#define MCLOFSET (MCLBYTES - 1) /* offset within a m_buf cluster */ + #ifndef NMBCLUSTERS #ifdef GATEWAY #define NMBCLUSTERS 1024 /* map size, max cluster allocation */ diff --git a/sys/arch/mvme88k/include/pmap_table.h b/sys/arch/mvme88k/include/pmap_table.h index 61b606bcefc..56753d3e85f 100644 --- a/sys/arch/mvme88k/include/pmap_table.h +++ b/sys/arch/mvme88k/include/pmap_table.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_table.h,v 1.5 1999/09/27 20:46:19 smurph Exp $ */ +/* $OpenBSD: pmap_table.h,v 1.6 2001/01/14 20:25:24 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University @@ -32,7 +32,8 @@ /* an entry is considered invalid if pm_size = 0 */ /* end of list is indicated by pm_size 0xffffffff */ - +#ifndef __MACHINE_PAMP_TABLE_H__ +#define __MACHINE_PAMP_TABLE_H__ typedef struct { vm_offset_t phys_start; /* in bytes */ vm_offset_t virt_start; /* in bytes */ @@ -44,6 +45,5 @@ typedef struct { typedef pmap_table_entry *pmap_table_t; pmap_table_t pmap_table_build __P((unsigned memory_size)); - - +#endif __MACHINE_PAMP_TABLE_H__ diff --git a/sys/arch/mvme88k/include/proc.h b/sys/arch/mvme88k/include/proc.h index 8dbe04ff142..7a5dbb54e3b 100644 --- a/sys/arch/mvme88k/include/proc.h +++ b/sys/arch/mvme88k/include/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.6 1999/09/27 20:46:19 smurph Exp $ */ +/* $OpenBSD: proc.h,v 1.7 2001/01/14 20:25:24 smurph Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -43,9 +43,11 @@ * @(#)proc.h 8.1 (Berkeley) 6/11/93 * * from: Header: proc.h,v 1.6 92/11/26 02:04:41 torek Exp (LBL) - * $Id: proc.h,v 1.6 1999/09/27 20:46:19 smurph Exp $ + * $Id: proc.h,v 1.7 2001/01/14 20:25:24 smurph Exp $ */ +#ifndef __MACHINE_PROC_H__ +#define __MACHINE_PROC_H__ #include <machine/pcb.h> #include <machine/mmu.h> @@ -61,3 +63,5 @@ struct mdproc { unsigned md_ss_taken_addr; /* single step address for ptrace */ unsigned md_ss_taken_instr; /* single step instruction for ptrace */ }; +#endif __MACHINE_PROC_H__ + diff --git a/sys/arch/mvme88k/include/profile.h b/sys/arch/mvme88k/include/profile.h index 646f49dda03..afc807b45cd 100644 --- a/sys/arch/mvme88k/include/profile.h +++ b/sys/arch/mvme88k/include/profile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: profile.h,v 1.7 1999/02/09 06:36:27 smurph Exp $ */ +/* $OpenBSD: profile.h,v 1.8 2001/01/14 20:25:24 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -33,9 +33,10 @@ * SUCH DAMAGE. * * from: @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $Id: profile.h,v 1.7 1999/02/09 06:36:27 smurph Exp $ + * $Id: profile.h,v 1.8 2001/01/14 20:25:24 smurph Exp $ */ - +#ifndef __MACHINE_PROFILE_H__ +#define __MACHINE_PROFILE_H__ #define _MCOUNT_DECL static inline void _mcount #define MCOUNT \ @@ -72,3 +73,4 @@ mcount() \ #define MCOUNT_ENTER s = splhigh() #define MCOUNT_EXIT splx(s) #endif /* KERNEL */ +#endif __MACHINE_PROFILE_H__ diff --git a/sys/arch/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h index 2f1650c85be..c8a8a13eac8 100644 --- a/sys/arch/mvme88k/include/prom.h +++ b/sys/arch/mvme88k/include/prom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prom.h,v 1.4 1999/05/29 04:41:45 smurph Exp $ */ +/* $OpenBSD: prom.h,v 1.5 2001/01/14 20:25:24 smurph Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -30,6 +30,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef __MACHINE_PROM_H__ +#define __MACHINE_PROM_H__ #define MVMEPROM_INCHR 0x00 #define MVMEPROM_INSTAT 0x01 @@ -175,4 +177,4 @@ struct mvmeprom_args { #ifndef RB_NOSYM #define RB_NOSYM 0x400 #endif - +#endif __MACHINE_PROM_H__ diff --git a/sys/arch/mvme88k/include/ptrace.h b/sys/arch/mvme88k/include/ptrace.h index 347494aaa76..73648c842de 100644 --- a/sys/arch/mvme88k/include/ptrace.h +++ b/sys/arch/mvme88k/include/ptrace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ptrace.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ +/* $OpenBSD: ptrace.h,v 1.5 2001/01/14 20:25:24 smurph Exp $ */ /* * Copyright (c) 1999, Steve Murphree, Jr. * Copyright (c) 1992, 1993 @@ -44,15 +44,17 @@ * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 * * from: Header: ptrace.h,v 1.6 92/11/26 02:04:43 torek Exp (LBL) - * $Id: ptrace.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ + * $Id: ptrace.h,v 1.5 2001/01/14 20:25:24 smurph Exp $ */ /* * m88k-dependent ptrace definitions. */ - +#ifndef __MACHINE_PTRACE_H__ +#define __MACHINE_PTRACE_H__ #define PT_STEP (PT_FIRSTMACH + 0) #define PT_GETREGS (PT_FIRSTMACH + 1) #define PT_SETREGS (PT_FIRSTMACH + 2) #define PT_GETFPREGS (PT_FIRSTMACH + 3) #define PT_SETFPREGS (PT_FIRSTMACH + 4) +#endif __MACHINE_PTRACE_H__ diff --git a/sys/arch/mvme88k/include/setjmp.h b/sys/arch/mvme88k/include/setjmp.h index 156329b3b38..86d1247430c 100644 --- a/sys/arch/mvme88k/include/setjmp.h +++ b/sys/arch/mvme88k/include/setjmp.h @@ -1,7 +1,9 @@ -/* $OpenBSD: setjmp.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ +/* $OpenBSD: setjmp.h,v 1.5 2001/01/14 20:25:24 smurph Exp $ */ /* * machine/setjmp.h: machine dependent setjmp-related information. */ - +#ifndef __MACHINE_SETJMP_H__ +#define __MACHINE_SETJMP_H__ #define _JBLEN 22 /* size, in longs, of a jmp_buf */ +#endif __MACHINE_SETJMP_H__ diff --git a/sys/arch/mvme88k/include/signal.h b/sys/arch/mvme88k/include/signal.h index 0f7c9f26b9c..70aa8af7172 100644 --- a/sys/arch/mvme88k/include/signal.h +++ b/sys/arch/mvme88k/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ +/* $OpenBSD: signal.h,v 1.5 2001/01/14 20:25:24 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -29,6 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ +#ifndef __MACHINE_SIGNAL_H__ +#define __MACHINE_SIGNAL_H__ typedef int sig_atomic_t; /* @@ -73,3 +75,4 @@ struct sigcontext { int sc_fpit; int sc_xxxx; /* padd to double word boundary */ }; +#endif __MACHINE_SIGNAL_H__ diff --git a/sys/arch/mvme88k/include/trap.h b/sys/arch/mvme88k/include/trap.h index 14eea437121..ea39c46f055 100644 --- a/sys/arch/mvme88k/include/trap.h +++ b/sys/arch/mvme88k/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.5 1999/09/27 20:46:19 smurph Exp $ */ +/* $OpenBSD: trap.h,v 1.6 2001/01/14 20:25:24 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University @@ -27,9 +27,8 @@ /* * Trap codes */ - -#ifndef _M88K_TRAP_H -#define _M88K_TRAP_H 1 +#ifndef __MACHINE_TRAP_H__ +#define __MACHINE_TRAP_H__ /* * Trap type values @@ -73,5 +72,5 @@ #define T_INT 28 /* interrupt exception */ #define T_USER 29 /* user mode fault */ -#endif _M88K_TRAP_H +#endif __MACHINE_TRAP_H__ diff --git a/sys/arch/mvme88k/include/vid.h b/sys/arch/mvme88k/include/vid.h index acaa280dace..518da55de15 100644 --- a/sys/arch/mvme88k/include/vid.h +++ b/sys/arch/mvme88k/include/vid.h @@ -1,3 +1,6 @@ +#ifndef __MACHINE_VID_H__ +#define __MACHINE_VID_H__ + #define START_BLOCK 1 #define LOADER_SIZE 2 #define LOADER_ADDRESS 0x1F0000 @@ -54,3 +57,4 @@ struct cfg { unsigned char cfg_4[196]; }; #endif +#endif __MACHINE_VID_H__ |