diff options
Diffstat (limited to 'sys/arch/mac68k')
27 files changed, 95 insertions, 105 deletions
diff --git a/sys/arch/mac68k/include/_types.h b/sys/arch/mac68k/include/_types.h index ce50c6171c0..35b1108bd5b 100644 --- a/sys/arch/mac68k/include/_types.h +++ b/sys/arch/mac68k/include/_types.h @@ -1,10 +1,10 @@ -/* $OpenBSD: _types.h,v 1.1 2006/01/06 18:50:09 millert Exp $ */ +/* $OpenBSD: _types.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */ /* public domain */ -#ifndef _MAC68K__TYPES_H_ -#define _MAC68K__TYPES_H_ +#ifndef _MACHINE__TYPES_H_ +#define _MACHINE__TYPES_H_ #include <m68k/_types.h> -#endif /* _MAC68K__TYPES_H_ */ +#endif /* _MACHINE__TYPES_H_ */ diff --git a/sys/arch/mac68k/include/asm.h b/sys/arch/mac68k/include/asm.h index e8e1274d44e..95c23293bbe 100644 --- a/sys/arch/mac68k/include/asm.h +++ b/sys/arch/mac68k/include/asm.h @@ -1,8 +1,8 @@ -/* $OpenBSD: asm.h,v 1.3 1997/11/30 06:10:29 gene Exp $ */ +/* $OpenBSD: asm.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: asm.h,v 1.2 1994/10/26 08:46:25 cgd Exp $ */ -#ifndef _MAC68K_ASM_H_ -#define _MAC68K_ASM_H_ +#ifndef _MACHINE_ASM_H_ +#define _MACHINE_ASM_H_ #include <m68k/asm.h> diff --git a/sys/arch/mac68k/include/atomic.h b/sys/arch/mac68k/include/atomic.h index 0f5a329af1e..c62462c7c3a 100644 --- a/sys/arch/mac68k/include/atomic.h +++ b/sys/arch/mac68k/include/atomic.h @@ -1,10 +1,10 @@ -/* $OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $ */ +/* $OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $ */ /* Public Domain */ -#ifndef __MAC68K_ATOMIC_H__ -#define __MAC68K_ATOMIC_H__ +#ifndef _MACHINE_ATOMIC_H_ +#define _MACHINE_ATOMIC_H_ #include <m68k/atomic.h> -#endif /* __MAC68K_ATOMIC_H__ */ +#endif /* _MACHINE_ATOMIC_H_ */ diff --git a/sys/arch/mac68k/include/autoconf.h b/sys/arch/mac68k/include/autoconf.h index 737fa7374e7..863e6ebf4fd 100644 --- a/sys/arch/mac68k/include/autoconf.h +++ b/sys/arch/mac68k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.14 2010/05/23 22:41:50 deraadt Exp $ */ +/* $OpenBSD: autoconf.h,v 1.15 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: autoconf.h,v 1.5 1996/12/17 06:47:40 scottr Exp $ */ /* @@ -33,8 +33,8 @@ * SUCH DAMAGE. */ -#ifndef _MAC68K_AUTOCONF_H_ -#define _MAC68K_AUTOCONF_H_ +#ifndef _MACHINE_AUTOCONF_H_ +#define _MACHINE_AUTOCONF_H_ /* * Autoconfiguration information. @@ -54,4 +54,4 @@ void startrtclock(void); #endif /* _KERNEL */ -#endif /* _MAC68K_AUTOCONF_H_ */ +#endif /* _MACHINE_AUTOCONF_H_ */ diff --git a/sys/arch/mac68k/include/bus.h b/sys/arch/mac68k/include/bus.h index 75c22b1f333..af7d89dc0dc 100644 --- a/sys/arch/mac68k/include/bus.h +++ b/sys/arch/mac68k/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.14 2009/07/26 18:48:55 miod Exp $ */ +/* $OpenBSD: bus.h,v 1.15 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: bus.h,v 1.9 1998/01/13 18:32:15 scottr Exp $ */ /*- @@ -57,8 +57,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MAC68K_BUS_H_ -#define _MAC68K_BUS_H_ +#ifndef _MACHINE_BUS_H_ +#define _MACHINE_BUS_H_ /* * Value for the mac68k bus space tag, not to be used directly by MI code. @@ -431,4 +431,4 @@ void mac68k_bssr4_swap(bus_space_tag_t t, bus_space_handle_t *h, #define bus_space_vaddr(t, h) (void *)((h).base) -#endif /* _MAC68K_BUS_H_ */ +#endif /* _MACHINE_BUS_H_ */ diff --git a/sys/arch/mac68k/include/cdefs.h b/sys/arch/mac68k/include/cdefs.h index cbacbe37e0f..5c9b2fcc416 100644 --- a/sys/arch/mac68k/include/cdefs.h +++ b/sys/arch/mac68k/include/cdefs.h @@ -1,8 +1,3 @@ -/* $OpenBSD: cdefs.h,v 1.5 2005/11/24 20:46:46 deraadt Exp $ */ - -#ifndef _MAC68K_CDEFS_H_ -#define _MAC68K_CDEFS_H_ - +/* $OpenBSD: cdefs.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $ */ +/* public domain */ #include <m68k/cdefs.h> - -#endif /* _MAC68K_CDEFS_H_ */ diff --git a/sys/arch/mac68k/include/db_machdep.h b/sys/arch/mac68k/include/db_machdep.h index 1b99e8c7ea7..f8188f7e258 100644 --- a/sys/arch/mac68k/include/db_machdep.h +++ b/sys/arch/mac68k/include/db_machdep.h @@ -1,9 +1,9 @@ -/* $OpenBSD: db_machdep.h,v 1.3 1997/11/30 06:10:30 gene Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: db_machdep.h,v 1.3 1994/10/26 08:46:27 cgd Exp $ */ -#ifndef _MAC68K_DB_MACHDEP_H_ -#define _MAC68K_DB_MACHDEP_H_ +#ifndef _MACHINE_DB_MACHDEP_H_ +#define _MACHINE_DB_MACHDEP_H_ #include <m68k/db_machdep.h> -#endif /* _MAC68K_DB_MACHDEP_H_ */ +#endif /* _MACHINE_DB_MACHDEP_H_ */ diff --git a/sys/arch/mac68k/include/disklabel.h b/sys/arch/mac68k/include/disklabel.h index 6142b2af4d2..98612bee869 100644 --- a/sys/arch/mac68k/include/disklabel.h +++ b/sys/arch/mac68k/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.8 2007/06/20 18:15:45 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.9 2011/03/23 16:54:36 pirofti Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -30,11 +30,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MAC68K_DISKLABEL_H_ -#define _MAC68K_DISKLABEL_H_ +#ifndef _MACHINE_DISKLABEL_H_ +#define _MACHINE_DISKLABEL_H_ #define LABELSECTOR 0 /* sector containing label */ #define LABELOFFSET 64 /* offset of label in sector */ #define MAXPARTITIONS 16 /* number of partitions */ -#endif /* _MAC68K_DISKLABEL_H_ */ +#endif /* _MACHINE_DISKLABEL_H_ */ diff --git a/sys/arch/mac68k/include/float.h b/sys/arch/mac68k/include/float.h index 22c30d794fe..142d8258609 100644 --- a/sys/arch/mac68k/include/float.h +++ b/sys/arch/mac68k/include/float.h @@ -1,9 +1,9 @@ -/* $OpenBSD: float.h,v 1.4 1997/11/30 06:12:26 gene Exp $ */ +/* $OpenBSD: float.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: float.h,v 1.6 1996/05/05 06:17:44 briggs Exp $ */ -#ifndef _MAC68K_FLOAT_H_ -#define _MAC68K_FLOAT_H_ +#ifndef _MACHINE_FLOAT_H_ +#define _MACHINE_FLOAT_H_ #include <m68k/float.h> -#endif /* _MAC68K_FLOAT_H_ */ +#endif /* _MACHINE_FLOAT_H_ */ diff --git a/sys/arch/mac68k/include/frame.h b/sys/arch/mac68k/include/frame.h index c6776983dc2..79c680e1459 100644 --- a/sys/arch/mac68k/include/frame.h +++ b/sys/arch/mac68k/include/frame.h @@ -1,9 +1,9 @@ -/* $OpenBSD: frame.h,v 1.4 1997/11/30 06:12:27 gene Exp $ */ +/* $OpenBSD: frame.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: frame.h,v 1.5 1996/05/05 06:17:46 briggs Exp $ */ -#ifndef _MAC68K_FRAME_H_ -#define _MAC68K_FRAME_H_ +#ifndef _MACHINE_FRAME_H_ +#define _MACHINE_FRAME_H_ #include <m68k/frame.h> -#endif /* _MAC68K_FRAME_H_ */ +#endif /* _MACHINE_FRAME_H_ */ diff --git a/sys/arch/mac68k/include/ieeefp.h b/sys/arch/mac68k/include/ieeefp.h index c4872b03a52..b9f71534588 100644 --- a/sys/arch/mac68k/include/ieeefp.h +++ b/sys/arch/mac68k/include/ieeefp.h @@ -1,9 +1,9 @@ -/* $OpenBSD: ieeefp.h,v 1.3 1997/11/30 06:10:31 gene Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: ieeefp.h,v 1.2 1995/04/16 16:47:07 jtc Exp $ */ -#ifndef _MAC68K_IEEEFP_H_ -#define _MAC68K_IEEEFP_H_ +#ifndef _MACHINE_IEEEFP_H_ +#define _MACHINE_IEEEFP_H_ #include <m68k/ieeefp.h> -#endif /* _MAC68K_IEEEFP_H_ */ +#endif /* _MACHINE_IEEEFP_H_ */ diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h index 5acce0eb251..64364f25a09 100644 --- a/sys/arch/mac68k/include/intr.h +++ b/sys/arch/mac68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.21 2010/04/23 03:50:22 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.22 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: intr.h,v 1.9 1998/08/12 06:58:42 scottr Exp $ */ /* @@ -28,8 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MAC68K_INTR_H_ -#define _MAC68K_INTR_H_ +#ifndef _MACHINE_INTR_H_ +#define _MACHINE_INTR_H_ #include <machine/psl.h> @@ -121,4 +121,4 @@ struct intrhand { }; #endif /* _KERNEL */ -#endif /* _MAC68K_INTR_H_ */ +#endif /* _MACHINE_INTR_H_ */ diff --git a/sys/arch/mac68k/include/limits.h b/sys/arch/mac68k/include/limits.h index 1d8171e47cf..0dd4fb31483 100644 --- a/sys/arch/mac68k/include/limits.h +++ b/sys/arch/mac68k/include/limits.h @@ -1,9 +1,4 @@ -/* $OpenBSD: limits.h,v 1.4 1997/11/30 06:12:29 gene Exp $ */ +/* $OpenBSD: limits.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: limits.h,v 1.6 1994/10/26 08:46:34 cgd Exp $ */ - -#ifndef _MAC68K_LIMITS_H_ -#define _MAC68K_LIMITS_H_ - +/* public domain */ #include <m68k/limits.h> - -#endif /* _MAC68K_LIMITS_H_ */ diff --git a/sys/arch/mac68k/include/param.h b/sys/arch/mac68k/include/param.h index c9e1348bc79..1747f5fc8ee 100644 --- a/sys/arch/mac68k/include/param.h +++ b/sys/arch/mac68k/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.21 2006/06/11 20:48:13 miod Exp $ */ +/* $OpenBSD: param.h,v 1.22 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: param.h,v 1.28 1997/03/01 06:57:45 scottr Exp $ */ /* @@ -73,8 +73,8 @@ * @(#)param.h 7.8 (Berkeley) 6/28/91 */ -#ifndef _MAC68K_PARAM_H_ -#define _MAC68K_PARAM_H_ +#ifndef _MACHINE_PARAM_H_ +#define _MACHINE_PARAM_H_ /* * Machine dependent constants for Macintosh II-and-similar series. @@ -97,4 +97,4 @@ void delay(unsigned); #define DELAY(ms) delay(ms) #endif /* _KERNEL && !_LOCORE */ -#endif /* _MAC68K_PARAM_H_ */ +#endif /* _MACHINE_PARAM_H_ */ diff --git a/sys/arch/mac68k/include/pmap.h b/sys/arch/mac68k/include/pmap.h index 6d0f75cf370..ad7cd3d90ea 100644 --- a/sys/arch/mac68k/include/pmap.h +++ b/sys/arch/mac68k/include/pmap.h @@ -1,7 +1,7 @@ -/* $OpenBSD: pmap.h,v 1.19 2005/04/27 00:12:43 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.20 2011/03/23 16:54:36 pirofti Exp $ */ -#ifndef _MAC68K_PMAP_H_ -#define _MAC68K_PMAP_H_ +#ifndef _MACHINE_PMAP_H_ +#define _MACHINE_PMAP_H_ #include <m68k/pmap_motorola.h> @@ -10,4 +10,4 @@ void pmap_init_md(void); #define PMAP_INIT_MD() pmap_init_md() #endif /* _KERNEL */ -#endif /* _MAC68K_PMAP_H_ */ +#endif /* _MACHINE_PMAP_H_ */ diff --git a/sys/arch/mac68k/include/profile.h b/sys/arch/mac68k/include/profile.h index 9ca89ff0903..d8f8974df40 100644 --- a/sys/arch/mac68k/include/profile.h +++ b/sys/arch/mac68k/include/profile.h @@ -1,8 +1,8 @@ -/* $OpenBSD: profile.h,v 1.4 1997/11/30 06:12:33 gene Exp $ */ +/* $OpenBSD: profile.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: profile.h,v 1.3 1996/05/05 06:17:55 briggs Exp $ */ -#ifndef _MAC68K_PROFILE_H_ -#define _MAC68K_PROFILE_H_ +#ifndef _MACHINE_PROFILE_H_ +#define _MACHINE_PROFILE_H_ #include <m68k/profile.h> diff --git a/sys/arch/mac68k/include/ptrace.h b/sys/arch/mac68k/include/ptrace.h index a9568f813a9..17a3905e7f5 100644 --- a/sys/arch/mac68k/include/ptrace.h +++ b/sys/arch/mac68k/include/ptrace.h @@ -1,8 +1,8 @@ -/* $OpenBSD: ptrace.h,v 1.3 1997/11/30 06:10:33 gene Exp $ */ +/* $OpenBSD: ptrace.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: ptrace.h,v 1.2 1994/10/26 08:46:43 cgd Exp $ */ -#ifndef _MAC68K_PTRACE_H_ -#define _MAC68K_PTRACE_H_ +#ifndef _MACHINE_PTRACE_H_ +#define _MACHINE_PTRACE_H_ #include <m68k/ptrace.h> diff --git a/sys/arch/mac68k/include/reg.h b/sys/arch/mac68k/include/reg.h index b52c1bb9b31..68d9dbd8fa1 100644 --- a/sys/arch/mac68k/include/reg.h +++ b/sys/arch/mac68k/include/reg.h @@ -1,10 +1,10 @@ -/* $OpenBSD: reg.h,v 1.5 2001/08/25 11:37:26 espie Exp $ */ +/* $OpenBSD: reg.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: reg.h,v 1.10 1996/05/05 06:18:00 briggs Exp $ */ -#ifndef _MAC68K_REG_H_ -#define _MAC68K_REG_H_ +#ifndef _MACHINE_REG_H_ +#define _MACHINE_REG_H_ #include <machine/frame.h> #include <m68k/reg.h> -#endif /* _MAC68K_REG_H_ */ +#endif /* _MACHINE_REG_H_ */ diff --git a/sys/arch/mac68k/include/scsi_5380.h b/sys/arch/mac68k/include/scsi_5380.h index 2a180f31d7f..dd52f93069f 100644 --- a/sys/arch/mac68k/include/scsi_5380.h +++ b/sys/arch/mac68k/include/scsi_5380.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_5380.h,v 1.3 1997/11/30 06:10:34 gene Exp $ */ +/* $OpenBSD: scsi_5380.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: scsi_5380.h,v 1.3 1994/10/26 08:46:46 cgd Exp $ */ /* @@ -34,8 +34,8 @@ * Defines for the NCR 5380 (SCSI chip), aka Am5380 */ -#ifndef _MAC68K_SCSI5380_H_ -#define _MAC68K_SCSI5380_H_ +#ifndef _MACHINE_SCSI_5380_H_ +#define _MACHINE_SCSI_5380_H_ /* * Register map @@ -144,4 +144,4 @@ typedef struct { #define SCI_CSR_DREQ 0x40 /* r: DMA request */ #define SCI_CSR_DONE 0x80 /* r: DMA count is zero */ -#endif /* _MAC68K_SCSI5380_H_ */ +#endif /* _MACHINE_SCSI_5380_H_ */ diff --git a/sys/arch/mac68k/include/setjmp.h b/sys/arch/mac68k/include/setjmp.h index 7723d37167d..d3ee5255fdf 100644 --- a/sys/arch/mac68k/include/setjmp.h +++ b/sys/arch/mac68k/include/setjmp.h @@ -1,8 +1,8 @@ -/* $OpenBSD: setjmp.h,v 1.3 1997/11/30 06:10:34 gene Exp $ */ +/* $OpenBSD: setjmp.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: setjmp.h,v 1.1 1994/12/20 10:36:57 cgd Exp $ */ -#ifndef _MAC68K_SETJMP_H_ -#define _MAC68K_SETJMP_H_ +#ifndef _MACHINE_SETJMP_H_ +#define _MACHINE_SETJMP_H_ #include <m68k/setjmp.h> diff --git a/sys/arch/mac68k/include/signal.h b/sys/arch/mac68k/include/signal.h index de8f84dbf23..8236a88bbde 100644 --- a/sys/arch/mac68k/include/signal.h +++ b/sys/arch/mac68k/include/signal.h @@ -1,8 +1,8 @@ -/* $OpenBSD: signal.h,v 1.3 1997/11/30 06:10:35 gene Exp $ */ +/* $OpenBSD: signal.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: signal.h,v 1.3 1994/10/26 08:46:47 cgd Exp $ */ -#ifndef _MAC68K_SIGNAL_H_ -#define _MAC68K_SIGNAL_H_ +#ifndef _MACHINE_SIGNAL_H_ +#define _MACHINE_SIGNAL_H_ #include <m68k/signal.h> diff --git a/sys/arch/mac68k/include/stdarg.h b/sys/arch/mac68k/include/stdarg.h index 1343263b0ab..d6ca78ac8dc 100644 --- a/sys/arch/mac68k/include/stdarg.h +++ b/sys/arch/mac68k/include/stdarg.h @@ -1,8 +1,8 @@ -/* $OpenBSD: stdarg.h,v 1.3 1997/11/30 06:10:35 gene Exp $ */ +/* $OpenBSD: stdarg.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: stdarg.h,v 1.5 1994/10/26 08:46:48 cgd Exp $ */ -#ifndef _MAC68K_STDARG_H_ -#define _MAC68K_STDARG_H_ +#ifndef _MACHINE_STDARG_H_ +#define _MACHINE_STDARG_H_ #include <m68k/stdarg.h> diff --git a/sys/arch/mac68k/include/trap.h b/sys/arch/mac68k/include/trap.h index e817d72270e..74e07d224b7 100644 --- a/sys/arch/mac68k/include/trap.h +++ b/sys/arch/mac68k/include/trap.h @@ -1,8 +1,8 @@ -/* $OpenBSD: trap.h,v 1.3 1997/11/30 06:10:36 gene Exp $ */ +/* $OpenBSD: trap.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: trap.h,v 1.5 1994/10/26 08:46:49 cgd Exp $ */ -#ifndef _MAC68K_TRAP_H_ -#define _MAC68K_TRAP_H_ +#ifndef _MACHINE_TRAP_H_ +#define _MACHINE_TRAP_H_ #include <m68k/trap.h> diff --git a/sys/arch/mac68k/include/varargs.h b/sys/arch/mac68k/include/varargs.h index 5b09d808011..1e90c548efc 100644 --- a/sys/arch/mac68k/include/varargs.h +++ b/sys/arch/mac68k/include/varargs.h @@ -1,8 +1,8 @@ -/* $OpenBSD: varargs.h,v 1.3 1997/11/30 06:10:36 gene Exp $ */ +/* $OpenBSD: varargs.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: varargs.h,v 1.2 1994/10/26 08:46:51 cgd Exp $ */ -#ifndef _MAC68K_VARARGS_H_ -#define _MAC68K_VARARGS_H_ +#ifndef _MACHINE_VARARGS_H_ +#define _MACHINE_VARARGS_H_ #include <m68k/varargs.h> diff --git a/sys/arch/mac68k/include/viareg.h b/sys/arch/mac68k/include/viareg.h index 4fc3dc5c32e..52ad5f10686 100644 --- a/sys/arch/mac68k/include/viareg.h +++ b/sys/arch/mac68k/include/viareg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: viareg.h,v 1.19 2007/09/10 20:29:48 miod Exp $ */ +/* $OpenBSD: viareg.h,v 1.20 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: viareg.h,v 1.6 1997/02/28 07:41:41 scottr Exp $ */ /*- @@ -38,8 +38,8 @@ /* * Prototype VIA control definitions */ -#ifndef _MAC68K_VIAREG_H_ -#define _MAC68K_VIAREG_H_ +#ifndef _MACHINE_VIAREG_H_ +#define _MACHINE_VIAREG_H_ /* VIA1 data register A */ #define DA1I_vSCCWrReq 0x80 @@ -219,4 +219,4 @@ void via1_register_irq(int, int (*)(void *), void *, const char *); int via2_register_irq(struct via2hand *, const char *); #endif /* _KERNEL */ -#endif /* _MAC68K_VIAREG_H_ */ +#endif /* _MACHINE_VIAREG_H_ */ diff --git a/sys/arch/mac68k/include/vmparam.h b/sys/arch/mac68k/include/vmparam.h index e477c3d4d0e..ec07dcede74 100644 --- a/sys/arch/mac68k/include/vmparam.h +++ b/sys/arch/mac68k/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.16 2006/09/17 22:23:40 miod Exp $ */ +/* $OpenBSD: vmparam.h,v 1.17 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: vmparam.h,v 1.8 1996/11/15 14:21:00 briggs Exp $ */ /* @@ -73,8 +73,8 @@ * @(#)vmparam.h 7.3 (Berkeley) 5/7/91 */ -#ifndef _MAC68K_VMPARAM_H_ -#define _MAC68K_VMPARAM_H_ +#ifndef _MACHINE_VMPARAM_H_ +#define _MACHINE_VMPARAM_H_ /* * Machine dependent constants for mac68k -- mostly derived from hp300. @@ -97,4 +97,4 @@ #define VM_PHYSSEG_MAX 8 #define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST -#endif /* _MAC68K_VMPARAM_H_ */ +#endif /* _MACHINE_VMPARAM_H_ */ diff --git a/sys/arch/mac68k/include/z8530var.h b/sys/arch/mac68k/include/z8530var.h index f031d38cda9..7e5e45e0641 100644 --- a/sys/arch/mac68k/include/z8530var.h +++ b/sys/arch/mac68k/include/z8530var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530var.h,v 1.8 2009/03/15 20:40:25 miod Exp $ */ +/* $OpenBSD: z8530var.h,v 1.9 2011/03/23 16:54:36 pirofti Exp $ */ /* $NetBSD: z8530var.h,v 1.2 1996/06/07 10:27:19 briggs Exp $ */ /* @@ -42,8 +42,8 @@ * @(#)zsvar.h 8.1 (Berkeley) 6/11/93 */ -#ifndef _MAC68K_Z8530VAR_H_ -#define _MAC68K_Z8530VAR_H_ +#ifndef _MACHINE_Z8530VAR_H_ +#define _MACHINE_Z8530VAR_H_ #ifdef _KERNEL #include <mac68k/dev/z8530sc.h> |