diff options
author | imp <imp@cvs.openbsd.org> | 1999-01-27 04:46:07 +0000 |
---|---|---|
committer | imp <imp@cvs.openbsd.org> | 1999-01-27 04:46:07 +0000 |
commit | cc0a7779d1635c38e681eea667b0c3fd88dc24db (patch) | |
tree | 646a4589b70d2b23e13514cc15c3968362380576 /sys/arch/mips | |
parent | 9fee6a7f3ec81de937c6277c7777d70e8280ea80 (diff) |
Protect against multiple includes and regularize cpp symbols used
Diffstat (limited to 'sys/arch/mips')
36 files changed, 153 insertions, 117 deletions
diff --git a/sys/arch/mips/include/ansi.h b/sys/arch/mips/include/ansi.h index 4aafacf7373..ee0365611bd 100644 --- a/sys/arch/mips/include/ansi.h +++ b/sys/arch/mips/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.2 1998/05/08 15:53:48 millert Exp $ */ +/* $OpenBSD: ansi.h,v 1.3 1999/01/27 04:46:04 imp Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -74,4 +74,4 @@ #define _BSD_WINT_T_ int /* wint_t */ #define _BSD_RUNE_T_ int /* rune_t */ -#endif /* _MIPS_ANSI_H_ */ +#endif /* !_MIPS_ANSI_H_ */ diff --git a/sys/arch/mips/include/archtype.h b/sys/arch/mips/include/archtype.h index a2d100ac175..b90a59e1c1c 100644 --- a/sys/arch/mips/include/archtype.h +++ b/sys/arch/mips/include/archtype.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archtype.h,v 1.5 1998/10/15 21:30:14 imp Exp $ */ +/* $OpenBSD: archtype.h,v 1.6 1999/01/27 04:46:04 imp Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom * @@ -31,8 +31,8 @@ * */ -#ifndef _MACHINE_ARCHTYPE_H_ -#define _MACHINE_ARCHTYPE_H_ +#ifndef _MIPS_ARCHTYPE_H_ +#define _MIPS_ARCHTYPE_H_ /* * Define architectural identitys for the different Mips machines. */ @@ -61,4 +61,4 @@ extern int system_type; /* Global system type indicator */ -#endif /* _MACHINE_ARCHTYPE_H_ */ +#endif /* !_MIPS_ARCHTYPE_H_ */ diff --git a/sys/arch/mips/include/cdefs.h b/sys/arch/mips/include/cdefs.h index 13bd1eaacb2..a877ff00828 100644 --- a/sys/arch/mips/include/cdefs.h +++ b/sys/arch/mips/include/cdefs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cdefs.h,v 1.1 1998/01/28 11:14:37 pefo Exp $ */ +/* $OpenBSD: cdefs.h,v 1.2 1999/01/27 04:46:04 imp Exp $ */ /* $NetBSD: cdefs.h,v 1.3 1995/05/03 06:04:54 mellon Exp $ */ /* @@ -28,12 +28,12 @@ * rights to redistribute these changes. */ -#ifndef _MACHINE_CDEFS_H_ -#define _MACHINE_CDEFS_H_ +#ifndef _MIPS_CDEFS_H_ +#define _MIPS_CDEFS_H_ #define _C_LABEL(x) _STRING(x) #define __indr_references(sym,msg) /* nothing */ #define __warn_references(sym,msg) /* nothing */ -#endif /* !_MACHINE_CDEFS_H_ */ +#endif /* !_MIPS_CDEFS_H_ */ diff --git a/sys/arch/mips/include/cpu.h b/sys/arch/mips/include/cpu.h index d393d07bbae..cd507216c8c 100644 --- a/sys/arch/mips/include/cpu.h +++ b/sys/arch/mips/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.5 1998/10/15 21:30:14 imp Exp $ */ +/* $OpenBSD: cpu.h,v 1.6 1999/01/27 04:46:04 imp Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -46,8 +46,8 @@ * from: @(#)cpu.h 8.4 (Berkeley) 1/4/94 */ -#ifndef _CPU_H_ -#define _CPU_H_ +#ifndef _MIPS_CPU_H_ +#define _MIPS_CPU_H_ #include <machine/psl.h> @@ -443,4 +443,4 @@ extern u_int32_t cpu_counter_last; /* Last compare value loaded */ #define enablertclock() #endif /* _KERNEL */ -#endif /* _CPU_H_ */ +#endif /* !_MIPS_CPU_H_ */ diff --git a/sys/arch/mips/include/db_machdep.h b/sys/arch/mips/include/db_machdep.h index 019418e0d51..9d4f66ee948 100644 --- a/sys/arch/mips/include/db_machdep.h +++ b/sys/arch/mips/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.3 1998/10/15 21:30:14 imp Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.4 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -32,8 +32,8 @@ * */ -#ifndef _MACHINE_DB_MACHDEP_H_ -#define _MACHINE_DB_MACHDEP_H_ +#ifndef _MIPS_DB_MACHDEP_H_ +#define _MIPS_DB_MACHDEP_H_ #include <machine/regnum.h> #include <machine/frame.h> @@ -77,4 +77,4 @@ db_addr_t next_instr_address __P((db_addr_t, boolean_t)); #define inst_store(i) (db_inst_type(i) == IT_STORE) int db_inst_type __P((int)); -#endif /* _MACHINE_DB_MACHDEP_H_ */ +#endif /* !_MIPS_DB_MACHDEP_H_ */ diff --git a/sys/arch/mips/include/disklabel.h b/sys/arch/mips/include/disklabel.h index 65ad34864dc..c9df62ec4b6 100644 --- a/sys/arch/mips/include/disklabel.h +++ b/sys/arch/mips/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.3 1998/02/24 04:22:39 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.4 1999/01/27 04:46:05 imp Exp $ */ /* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */ /* @@ -31,8 +31,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MACHINE_DISKLABEL_H_ -#define _MACHINE_DISKLABEL_H_ +#ifndef _MIPS_DISKLABEL_H_ +#define _MIPS_DISKLABEL_H_ #define LABELSECTOR 1 /* sector containing label */ #define LABELOFFSET 0 /* offset of label in sector */ @@ -84,4 +84,4 @@ struct cpu_disklabel { #define DPSECT(s) ((s) & 0x3f) #define DPCYL(c, s) ((c) + (((s) & 0xc0) << 2)) -#endif /* _MACHINE_DISKLABEL_H_ */ +#endif /* !_MIPS_DISKLABEL_H_ */ diff --git a/sys/arch/mips/include/dlfcn.h b/sys/arch/mips/include/dlfcn.h index 20ca62e0f47..a427f955612 100644 --- a/sys/arch/mips/include/dlfcn.h +++ b/sys/arch/mips/include/dlfcn.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dlfcn.h,v 1.1 1998/01/28 11:14:39 pefo Exp $ */ +/* $OpenBSD: dlfcn.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -32,11 +32,11 @@ * */ -#ifndef _DLFCN_H -#define _DLFCN_H 1 +#ifndef _MIPS_DLFCN_H_ +#define _MIPS_DLFCN_H_ /* * This is a dummy file. Empty until libdl has been done. */ -#endif /* _DLFCN_H */ +#endif /* _MIPS_DLFCN_H_ */ diff --git a/sys/arch/mips/include/ecoff.h b/sys/arch/mips/include/ecoff.h index 171cb02d84a..872cb2dcf78 100644 --- a/sys/arch/mips/include/ecoff.h +++ b/sys/arch/mips/include/ecoff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ecoff.h,v 1.1 1998/01/28 11:14:40 pefo Exp $ */ +/* $OpenBSD: ecoff.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* $NetBSD: ecoff.h,v 1.4 1995/06/16 02:07:33 mellon Exp $ */ /* @@ -32,6 +32,9 @@ * SUCH DAMAGE. */ +#ifndef _MIPS_ECOFF_H_ +#define _MIPS_ECOFF_H_ + #define ECOFF_LDPGSZ 4096 #define ECOFF_PAD @@ -92,3 +95,4 @@ struct ecoff_extsym { int es_indexfld; }; +#endif /* !_MIPS_ECOFF_H_ */ diff --git a/sys/arch/mips/include/elf_abi.h b/sys/arch/mips/include/elf_abi.h index 18b1ff7cbef..a2f61bdc300 100644 --- a/sys/arch/mips/include/elf_abi.h +++ b/sys/arch/mips/include/elf_abi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: elf_abi.h,v 1.1 1998/01/28 11:14:41 pefo Exp $ */ +/* $OpenBSD: elf_abi.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -32,8 +32,8 @@ * */ -#ifndef _MACHINE_ELF_ABI_H -#define _MACHINE_ELF_ABI_H +#ifndef _MIPS_ELF_ABI_H +#define _MIPS_ELF_ABI_H /* From MIPS ABI supplemental */ @@ -60,4 +60,4 @@ #define DT_PROCNUM (DT_MIPS_HIPAGENO - DT_LOPROC + 1) -#endif /* _MACHINE_ELF_ABI_H */ +#endif /* _MIPS_ELF_ABI_H */ diff --git a/sys/arch/mips/include/float.h b/sys/arch/mips/include/float.h index 4061d813705..3934aff1a02 100644 --- a/sys/arch/mips/include/float.h +++ b/sys/arch/mips/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.1 1998/01/28 11:14:41 pefo Exp $ */ +/* $OpenBSD: float.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1989, 1993 @@ -35,8 +35,8 @@ * @(#)float.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _MACHINE_FLOAT_H_ -#define _MACHINE_FLOAT_H_ +#ifndef _MIPS_FLOAT_H_ +#define _MIPS_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 /* _MACHINE_FLOAT_H_ */ +#endif /* _MIPS_FLOAT_H_ */ diff --git a/sys/arch/mips/include/frame.h b/sys/arch/mips/include/frame.h index 56eebc66c85..3043845d44f 100644 --- a/sys/arch/mips/include/frame.h +++ b/sys/arch/mips/include/frame.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frame.h,v 1.4 1998/10/15 21:30:14 imp Exp $ */ +/* $OpenBSD: frame.h,v 1.5 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -31,11 +31,11 @@ * SUCH DAMAGE. * */ -#ifndef _MACHINE_FRAME_H_ -#define _MACHINE_FRAME_H_ +#ifndef _MIPS_FRAME_H_ +#define _MIPS_FRAME_H_ struct trap_frame { int reg[NUMSAVEREGS]; }; -#endif /*_MACHINE_FRAME_H_*/ +#endif /* !_MIPS_FRAME_H_ */ diff --git a/sys/arch/mips/include/ieeefp.h b/sys/arch/mips/include/ieeefp.h index 5324ab8b495..a68423cf7d6 100644 --- a/sys/arch/mips/include/ieeefp.h +++ b/sys/arch/mips/include/ieeefp.h @@ -1,12 +1,12 @@ -/* $OpenBSD: ieeefp.h,v 1.1 1998/01/28 11:14:43 pefo Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* * Written by J.T. Conklin, Apr 11, 1995 * Public domain. */ -#ifndef _MACHINE_IEEEFP_H_ -#define _MACHINE_IEEEFP_H_ +#ifndef _MIPS_IEEEFP_H_ +#define _MIPS_IEEEFP_H_ typedef int fp_except; #define FP_X_IMP 0x01 /* imprecise (loss of precision) */ @@ -22,4 +22,4 @@ typedef enum { FP_RM=3 /* round toward negative infinity */ } fp_rnd; -#endif /* _MACHINE_IEEEFP_H_ */ +#endif /* !_MIPS_IEEEFP_H_ */ diff --git a/sys/arch/mips/include/kbdreg.h b/sys/arch/mips/include/kbdreg.h index 87e456eaf31..5c3a6e71bd8 100644 --- a/sys/arch/mips/include/kbdreg.h +++ b/sys/arch/mips/include/kbdreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kbdreg.h,v 1.1 1998/01/28 11:14:43 pefo Exp $ */ +/* $OpenBSD: kbdreg.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -30,8 +30,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _KBDREG_H_ -#define _KBDREG_H_ +#ifndef _MIPS_KBDREG_H_ +#define _MIPS_KBDREG_H_ /* * Keyboard controller definitions @@ -159,4 +159,4 @@ kb_put8042(v) #endif /* _KERNEL */ -#endif /* _KBDREG_H_ */ +#endif /* _MIPS_KBDREG_H_ */ diff --git a/sys/arch/mips/include/kcore.h b/sys/arch/mips/include/kcore.h index f79c1af8303..48139015eff 100644 --- a/sys/arch/mips/include/kcore.h +++ b/sys/arch/mips/include/kcore.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kcore.h,v 1.1 1998/01/28 11:14:44 pefo Exp $ */ +/* $OpenBSD: kcore.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* $NetBSD: kcore.h,v 1.1 1996/03/10 21:55:18 leo Exp $ */ /* @@ -31,8 +31,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MACHINE_KCORE_H_ -#define _MACHINE_KCORE_H_ +#ifndef _MIPS_KCORE_H_ +#define _MIPS_KCORE_H_ #define NPHYS_RAM_SEGS 8 @@ -42,4 +42,4 @@ typedef struct cpu_kcore_hdr { phys_ram_seg_t ram_segs[NPHYS_RAM_SEGS]; } cpu_kcore_hdr_t; -#endif /* _MACHINE_KCORE_H_ */ +#endif /* _MIPS_KCORE_H_ */ diff --git a/sys/arch/mips/include/kdbparam.h b/sys/arch/mips/include/kdbparam.h index cc26debe95d..d9a04f2543b 100644 --- a/sys/arch/mips/include/kdbparam.h +++ b/sys/arch/mips/include/kdbparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kdbparam.h,v 1.1 1998/01/28 11:14:45 pefo Exp $ */ +/* $OpenBSD: kdbparam.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,6 +38,9 @@ * @(#)kdbparam.h 8.1 (Berkeley) 6/10/93 */ +#ifndef _MIPS_KDBPARAM_H_ +#define _MIPS_KDBPARAM_H_ + /* * Machine dependent definitions for kdb. */ @@ -72,3 +75,5 @@ void kdbwrite __P((char *, int)); void kdbprintins __P((int, long)); void kdbstacktrace __P((int)); char *kdbmalloc __P((int)); + +#endif /* !_MIPS_KDBPARAM_H_ */ diff --git a/sys/arch/mips/include/limits.h b/sys/arch/mips/include/limits.h index 687b0277d09..64c773e03f9 100644 --- a/sys/arch/mips/include/limits.h +++ b/sys/arch/mips/include/limits.h @@ -1,4 +1,4 @@ -/* $OpenBSD: limits.h,v 1.2 1998/03/22 21:15:16 millert Exp $ */ +/* $OpenBSD: limits.h,v 1.3 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1988, 1993 @@ -35,8 +35,8 @@ * @(#)limits.h 8.3 (Berkeley) 1/4/94 */ -#ifndef _MACHINE_LIMITS_H_ -#define _MACHINE_LIMITS_H_ +#ifndef _MIPS_LIMITS_H_ +#define _MIPS_LIMITS_H_ #define CHAR_BIT 8 /* number of bits in a char */ #define MB_LEN_MAX 6 /* Allow 31 bit UTF2 */ @@ -105,4 +105,4 @@ #define FLT_MIN 1.17549435E-38F #endif -#endif /* _MACHINE_LIMITS_H_ */ +#endif /* !_MIPS_LIMITS_H_ */ diff --git a/sys/arch/mips/include/link.h b/sys/arch/mips/include/link.h index 96a53129a22..87c4c9f7bde 100644 --- a/sys/arch/mips/include/link.h +++ b/sys/arch/mips/include/link.h @@ -1,4 +1,4 @@ -/* $OpenBSD: link.h,v 1.1 1998/01/28 11:14:46 pefo Exp $ */ +/* $OpenBSD: link.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -32,8 +32,8 @@ * */ -#ifndef _MACHINE_LINK_H -#define _MACHINE_LINK_H +#ifndef _MIPS_LINK_H +#define _MIPS_LINK_H #include <elf_abi.h> #include <machine/elf_abi.h> @@ -122,4 +122,4 @@ struct link_map unsigned int l_init_running:1; /* Nonzero while DT_INIT function runs. */ }; -#endif /* _MACHINE_LINK_H */ +#endif /* !_MIPS_LINK_H */ diff --git a/sys/arch/mips/include/memconf.h b/sys/arch/mips/include/memconf.h index 1b3b3c8e76d..aba51444904 100644 --- a/sys/arch/mips/include/memconf.h +++ b/sys/arch/mips/include/memconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: memconf.h,v 1.1 1998/01/28 11:14:48 pefo Exp $ */ +/* $OpenBSD: memconf.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -34,8 +34,8 @@ * Memory config list used by pmap_bootstrap. */ -#ifndef _MACHINE_MEMCONF_H_ -#define _MACHINE_MEMCONF_H_ +#ifndef _MIPS_MEMCONF_H_ +#define _MIPS_MEMCONF_H_ struct mem_descriptor { vm_offset_t mem_start; @@ -47,4 +47,4 @@ struct mem_descriptor { extern struct mem_descriptor mem_layout[]; #endif -#endif /* _MACHINE_MEMCONF_H_ */ +#endif /* !_MIPS_MEMCONF_H_ */ diff --git a/sys/arch/mips/include/mips_opcode.h b/sys/arch/mips/include/mips_opcode.h index ea19d727d29..d55bc8e2d55 100644 --- a/sys/arch/mips/include/mips_opcode.h +++ b/sys/arch/mips/include/mips_opcode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mips_opcode.h,v 1.1 1998/01/28 11:14:48 pefo Exp $ */ +/* $OpenBSD: mips_opcode.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,8 +38,8 @@ * from: @(#)mips_opcode.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _MACHINE_MIPS_OPCODE_H -#define _MACHINE_MIPS_OPCODE_H +#ifndef _MIPS_MIPS_OPCODE_H +#define _MIPS_MIPS_OPCODE_H /* * Define the instruction formats and opcode values for the * MIPS instruction set. @@ -293,4 +293,4 @@ typedef union { #define COPz_BCL_TRUE 0x02 #define COPz_BCL_FALSE 0x00 -#endif /* _MACHINE_MIPS_OPCODE_H */ +#endif /* !_MIPS_MIPS_OPCODE_H */ diff --git a/sys/arch/mips/include/param.h b/sys/arch/mips/include/param.h index eded38fa051..5368dca22ff 100644 --- a/sys/arch/mips/include/param.h +++ b/sys/arch/mips/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.1 1998/01/28 11:14:49 pefo Exp $ */ +/* $OpenBSD: param.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -41,8 +41,8 @@ * from: @(#)param.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _MACHINE_PARAM_H_ -#define _MACHINE_PARAM_H_ +#ifndef _MIPS_PARAM_H_ +#define _MIPS_PARAM_H_ #ifdef _KERNEL #ifdef _LOCORE @@ -157,4 +157,4 @@ #define DELAY(n) { register int N = (n); while (--N > 0); } -#endif /* _MACHINE_PARAM_H_ */ +#endif /* !_MIPS_PARAM_H_ */ diff --git a/sys/arch/mips/include/pcb.h b/sys/arch/mips/include/pcb.h index 0f8ba7b48c1..28295350643 100644 --- a/sys/arch/mips/include/pcb.h +++ b/sys/arch/mips/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.4 1998/10/15 21:30:14 imp Exp $ */ +/* $OpenBSD: pcb.h,v 1.5 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -41,6 +41,9 @@ * from: @(#)pcb.h 8.1 (Berkeley) 6/10/93 */ +#ifndef _MIPS_PCB_H_ +#define _MIPS_PCB_H_ + /* * MIPS process control block */ @@ -59,3 +62,4 @@ struct pcb struct md_coredump { long md_pad[8]; }; +#endif /* !_MIPS_PCB_H_ */ diff --git a/sys/arch/mips/include/pio.h b/sys/arch/mips/include/pio.h index a2b15be84ad..428af11425a 100644 --- a/sys/arch/mips/include/pio.h +++ b/sys/arch/mips/include/pio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pio.h,v 1.3 1998/10/15 21:30:14 imp Exp $ */ +/* $OpenBSD: pio.h,v 1.4 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1995 Per Fogelstrom. All rights reserved. @@ -29,8 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MACHINE_PIO_H_ -#define _MACHINE_PIO_H_ +#ifndef _MIPS_PIO_H_ +#define _MIPS_PIO_H_ /* * I/O macros. @@ -54,4 +54,4 @@ void outsb __P((u_int8_t *, const u_int8_t *,int)); void outsw __P((u_int16_t *, const u_int16_t *,int)); void outsl __P((u_int32_t *, const u_int32_t *,int)); -#endif /*_MACHINE_PIO_H_*/ +#endif /* !_MIPS_PIO_H_ */ diff --git a/sys/arch/mips/include/pmap.h b/sys/arch/mips/include/pmap.h index c1f1e197d60..d7ee4c0bfcd 100644 --- a/sys/arch/mips/include/pmap.h +++ b/sys/arch/mips/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.1 1998/01/28 11:14:51 pefo Exp $ */ +/* $OpenBSD: pmap.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1987 Carnegie-Mellon University @@ -39,8 +39,8 @@ * from: @(#)pmap.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _MACHINE_PMAP_H_ -#define _MACHINE_PMAP_H_ +#ifndef _MIPS_PMAP_H_ +#define _MIPS_PMAP_H_ /* * The user address space is 2Gb (0x0 - 0x80000000). @@ -117,4 +117,4 @@ void pmap_page_cache __P((vm_offset_t, int));; #endif /* _KERNEL */ -#endif /* _MACHINE_PMAP_H_ */ +#endif /* !_MIPS_PMAP_H_ */ diff --git a/sys/arch/mips/include/proc.h b/sys/arch/mips/include/proc.h index 43b9ef42ba1..7ad4d1ead07 100644 --- a/sys/arch/mips/include/proc.h +++ b/sys/arch/mips/include/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.3 1998/10/15 21:30:14 imp Exp $ */ +/* $OpenBSD: proc.h,v 1.4 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1992, 1993 @@ -38,8 +38,8 @@ * @(#)proc.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _MACHINE_PROC_H_ -#define _MACHINE_PROC_H_ +#ifndef _MIPS_PROC_H_ +#define _MIPS_PROC_H_ /* * Machine-dependent part of the proc structure. @@ -55,4 +55,4 @@ struct mdproc { /* md_flags */ #define MDP_FPUSED 0x0001 /* floating point coprocessor used */ -#endif /* _MACHINE_PROC_H_ */ +#endif /* !_MIPS_PROC_H_ */ diff --git a/sys/arch/mips/include/profile.h b/sys/arch/mips/include/profile.h index a1144be3997..429c8ee0a47 100644 --- a/sys/arch/mips/include/profile.h +++ b/sys/arch/mips/include/profile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: profile.h,v 1.1 1998/01/28 11:14:52 pefo Exp $ */ +/* $OpenBSD: profile.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */ /* * Copyright (c) 1992, 1993 @@ -37,8 +37,8 @@ * * from: @(#)profile.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _MACHINE_PROFILE_H_ -#define _MACHINE_PROFILE_H_ +#ifndef _MIPS_PROFILE_H_ +#define _MIPS_PROFILE_H_ #define _MCOUNT_DECL static void ___mcount @@ -85,4 +85,4 @@ #define MCOUNT_EXIT _splx(s) #endif /* _KERNEL */ -#endif /* _MACHINE_PROFILE_H_ */ +#endif /* !_MIPS_PROFILE_H_ */ diff --git a/sys/arch/mips/include/ptrace.h b/sys/arch/mips/include/ptrace.h index ee03e08d26b..cb92fb71dbc 100644 --- a/sys/arch/mips/include/ptrace.h +++ b/sys/arch/mips/include/ptrace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ptrace.h,v 1.1 1998/01/28 11:14:52 pefo Exp $ */ +/* $OpenBSD: ptrace.h,v 1.2 1999/01/27 04:46:06 imp Exp $ */ /* * Copyright (c) 1992, 1993 @@ -35,6 +35,9 @@ * from: @(#)ptrace.h 8.1 (Berkeley) 6/10/93 */ +#ifndef _MIPS_PTRACE_H_ +#define _MIPS_PTRACE_H_ + /* * Machine dependent trace commands. * @@ -43,3 +46,5 @@ #define PT_GETREGS (PT_FIRSTMACH+0) #define PT_SETREGS (PT_FIRSTMACH+1) #define PT_STEP (PT_FIRSTMACH+2) + +#endif /* !_MIPS_PTRACE_H_ */ diff --git a/sys/arch/mips/include/reg.h b/sys/arch/mips/include/reg.h index 0c7c746ac3c..ca64bb189f7 100644 --- a/sys/arch/mips/include/reg.h +++ b/sys/arch/mips/include/reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: reg.h,v 1.1 1998/01/28 11:14:53 pefo Exp $ */ +/* $OpenBSD: reg.h,v 1.2 1999/01/27 04:46:06 imp Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -41,8 +41,8 @@ * @(#)reg.h 8.2 (Berkeley) 1/11/94 */ -#ifndef _MACHINE_REG_H_ -#define _MACHINE_REG_H_ +#ifndef _MIPS_REG_H_ +#define _MIPS_REG_H_ /* * Location of the users' stored * registers relative to ZERO. @@ -58,4 +58,4 @@ struct reg { int r_regs[71]; /* numbered as above */ }; -#endif /*_MACHINE_REG_H_*/ +#endif /*_MIPS_REG_H_*/ diff --git a/sys/arch/mips/include/regdef.h b/sys/arch/mips/include/regdef.h index 2b2879326e5..5e5979e21c4 100644 --- a/sys/arch/mips/include/regdef.h +++ b/sys/arch/mips/include/regdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: regdef.h,v 1.2 1998/03/16 09:03:08 pefo Exp $ */ +/* $OpenBSD: regdef.h,v 1.3 1999/01/27 04:46:06 imp Exp $ */ /* * Copyright (c) 1992, 1993 @@ -38,8 +38,8 @@ * * @(#)regdef.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _MACHINE_REGDEF_H_ -#define _MACHINE_REGDEF_H_ +#ifndef _MIPS_REGDEF_H_ +#define _MIPS_REGDEF_H_ #define zero $0 /* always zero */ #define AT $at /* assembler temp */ @@ -74,4 +74,4 @@ #define s8 $30 /* one more callee saved */ #define ra $31 /* return address */ -#endif /* _MACHINE_REGDEF_H_ */ +#endif /* !_MIPS_REGDEF_H_ */ diff --git a/sys/arch/mips/include/regnum.h b/sys/arch/mips/include/regnum.h index 0766179d722..7c5cfc0b142 100644 --- a/sys/arch/mips/include/regnum.h +++ b/sys/arch/mips/include/regnum.h @@ -1,4 +1,4 @@ -/* $OpenBSD: regnum.h,v 1.2 1998/03/16 09:03:14 pefo Exp $ */ +/* $OpenBSD: regnum.h,v 1.3 1999/01/27 04:46:06 imp Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -41,6 +41,9 @@ * @(#)reg.h 8.2 (Berkeley) 1/11/94 */ +#ifndef _MIPS_REGNUM_H_ +#define _MIPS_REGNUM_H_ + #define STAND_ARG_SIZE 16 #define STAND_FRAME_SIZE 24 #define STAND_RA_OFFSET 20 @@ -138,3 +141,4 @@ int ipcreg[NIPCREG] = { F24, F25, F26, F27, F28, F29, F30, F31, FSR, }; #endif +#endif /* !_MIPS_REGNUM_H_ */ diff --git a/sys/arch/mips/include/setjmp.h b/sys/arch/mips/include/setjmp.h index 9f1bc6a6eb2..df2aee0bf7b 100644 --- a/sys/arch/mips/include/setjmp.h +++ b/sys/arch/mips/include/setjmp.h @@ -1,7 +1,12 @@ -/* $OpenBSD: setjmp.h,v 1.1 1998/01/28 11:14:56 pefo Exp $ */ +/* $OpenBSD: setjmp.h,v 1.2 1999/01/27 04:46:06 imp Exp $ */ /* - * machine/setjmp.h: machine dependent setjmp-related information. + * mips/setjmp.h: machine dependent setjmp-related information. */ +#ifndef _MIPS_SETJMP_H_ +#define _MIPS_SETJMP_H_ + #define _JBLEN 83 /* size, in longs, of a jmp_buf */ + +#endif /* !_MIPS_SETJMP_H_ */ diff --git a/sys/arch/mips/include/spinlock.h b/sys/arch/mips/include/spinlock.h index 195dca1e929..11e7ae5597b 100644 --- a/sys/arch/mips/include/spinlock.h +++ b/sys/arch/mips/include/spinlock.h @@ -1,4 +1,4 @@ -/* $OpenBSD: spinlock.h,v 1.2 1999/01/26 23:39:29 d Exp $ */ +/* $OpenBSD: spinlock.h,v 1.3 1999/01/27 04:46:06 imp Exp $ */ #ifndef _MIPS_SPINLOCK_H_ #define _MIPS_SPINLOCK_H_ @@ -7,4 +7,4 @@ #define _SPINLOCK_LOCKED (1) typedef int _spinlock_lock_t; -#endif +#endif /* !_MIPS_SPINLOCK_H_ */ diff --git a/sys/arch/mips/include/stdarg.h b/sys/arch/mips/include/stdarg.h index 06525ef1286..dc8485fee4a 100644 --- a/sys/arch/mips/include/stdarg.h +++ b/sys/arch/mips/include/stdarg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdarg.h,v 1.1 1998/01/28 11:14:57 pefo Exp $ */ +/* $OpenBSD: stdarg.h,v 1.2 1999/01/27 04:46:06 imp Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -35,8 +35,8 @@ * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _MACHINE_STDARG_H_ -#define _MACHINE_STDARG_H_ +#ifndef _MIPS_STDARG_H_ +#define _MIPS_STDARG_H_ #include <machine/ansi.h> @@ -61,4 +61,4 @@ typedef _BSD_VA_LIST_ va_list; #define va_end(ap) ((void) 0) -#endif /* !_MACHINE_STDARG_H_ */ +#endif /* !_MIPS_STDARG_H_ */ diff --git a/sys/arch/mips/include/trap.h b/sys/arch/mips/include/trap.h index 8cfd70b52d9..7f32e5e4b18 100644 --- a/sys/arch/mips/include/trap.h +++ b/sys/arch/mips/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.2 1998/05/08 16:45:10 millert Exp $ */ +/* $OpenBSD: trap.h,v 1.3 1999/01/27 04:46:06 imp Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -41,6 +41,9 @@ * from: @(#)trap.h 8.1 (Berkeley) 6/10/93 */ +#ifndef _MIPS_TRAP_H_ +#define _MIPS_TRAP_H_ + /* * Trap codes also known in trap.c for name strings. * Used for indexing so modify with care. @@ -66,3 +69,5 @@ #define T_VCED 31 /* Virtual coherency data */ #define T_USER 0x20 /* user-mode flag or'ed with type */ + +#endif /* !_MIPS_TRAP_H_ */ diff --git a/sys/arch/mips/include/types.h b/sys/arch/mips/include/types.h index a0cebe1fd07..2165a448941 100644 --- a/sys/arch/mips/include/types.h +++ b/sys/arch/mips/include/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.5 1999/01/08 03:04:08 millert Exp $ */ +/* $OpenBSD: types.h,v 1.6 1999/01/27 04:46:06 imp Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,8 +38,8 @@ * @(#)types.h 8.3 (Berkeley) 1/5/94 */ -#ifndef _MACHINE_TYPES_H_ -#define _MACHINE_TYPES_H_ +#ifndef _MIPS_TYPES_H_ +#define _MIPS_TYPES_H_ #include <sys/cdefs.h> @@ -82,4 +82,4 @@ typedef int32_t register_t; #define __SWAP_BROKEN #define __FORK_BRAINDAMAGE -#endif /* _MACHINE_TYPES_H_ */ +#endif /* _MIPS_TYPES_H_ */ diff --git a/sys/arch/mips/include/varargs.h b/sys/arch/mips/include/varargs.h index dd5cda76d68..92c2e9a24a4 100644 --- a/sys/arch/mips/include/varargs.h +++ b/sys/arch/mips/include/varargs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: varargs.h,v 1.2 1998/03/16 09:03:16 pefo Exp $ */ +/* $OpenBSD: varargs.h,v 1.3 1999/01/27 04:46:06 imp Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -40,8 +40,8 @@ * @(#)varargs.h 8.2 (Berkeley) 3/22/94 */ -#ifndef _MACHINE_VARARGS_H_ -#define _MACHINE_VARARGS_H_ +#ifndef _MIPS_VARARGS_H_ +#define _MIPS_VARARGS_H_ #include <machine/stdarg.h> @@ -51,4 +51,4 @@ #define va_start(ap) \ ap = (char *)&va_alist -#endif /* !_MACHINE_VARARGS_H_ */ +#endif /* !_MIPS_VARARGS_H_ */ diff --git a/sys/arch/mips/include/vmparam.h b/sys/arch/mips/include/vmparam.h index 359aac27202..1e4b31119be 100644 --- a/sys/arch/mips/include/vmparam.h +++ b/sys/arch/mips/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.3 1998/10/15 21:30:14 imp Exp $ */ +/* $OpenBSD: vmparam.h,v 1.4 1999/01/27 04:46:06 imp Exp $ */ /* $NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $ */ /* @@ -42,6 +42,9 @@ * @(#)vmparam.h 8.2 (Berkeley) 4/22/94 */ +#ifndef _MIPS_VMPARAM_H_ +#define _MIPS_VMPARAM_H_ + /* * Machine dependent constants mips processors. */ @@ -235,3 +238,4 @@ struct vm_map; vm_offset_t kmem_alloc_upage __P((struct vm_map *, vm_size_t)); vm_offset_t vtophys __P((vm_offset_t, vm_size_t)); +#endif /* !_MIPS_VMPARAM_H_ */ |