Module Name: src
Committed By: matt
Date: Wed Jan 29 00:42:15 UTC 2014
Modified Files:
src/sys/arch/arm/include: aout_machdep.h asm.h bswap.h bus_defs.h
bus_funcs.h cpufunc.h int_types.h isa_machdep.h limits.h ofw.h
pio.h proc.h reg.h signal.h
Log Message:
Make multiple inclusion symbols always start with _ARM_ (not _ARM32_ or
_MACHINE_).
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/include/aout_machdep.h \
src/sys/arch/arm/include/bus_funcs.h src/sys/arch/arm/include/reg.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/include/asm.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/include/bswap.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/include/bus_defs.h \
src/sys/arch/arm/include/int_types.h
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/arm/include/cpufunc.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/include/isa_machdep.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/limits.h \
src/sys/arch/arm/include/proc.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/include/ofw.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/include/pio.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/include/signal.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/aout_machdep.h
diff -u src/sys/arch/arm/include/aout_machdep.h:1.5 src/sys/arch/arm/include/aout_machdep.h:1.6
--- src/sys/arch/arm/include/aout_machdep.h:1.5 Sun Dec 11 12:16:46 2005
+++ src/sys/arch/arm/include/aout_machdep.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: aout_machdep.h,v 1.5 2005/12/11 12:16:46 christos Exp $ */
+/* $NetBSD: aout_machdep.h,v 1.6 2014/01/29 00:42:15 matt Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -32,8 +32,8 @@
* SUCH DAMAGE.
*/
-#ifndef _ARM32_AOUT_MACHDEP_H_
-#define _ARM32_AOUT_MACHDEP_H_
+#ifndef _ARM_AOUT_MACHDEP_H_
+#define _ARM_AOUT_MACHDEP_H_
#define AOUT_LDPGSZ 4096
@@ -56,4 +56,4 @@ struct relocation_info_arm6 {
/* No special executable format */
#define cpu_exec_aout_makecmds(a, b) ENOEXEC
-#endif /* _ARM32_AOUT_MACHDEP_H_ */
+#endif /* _ARM_AOUT_MACHDEP_H_ */
Index: src/sys/arch/arm/include/bus_funcs.h
diff -u src/sys/arch/arm/include/bus_funcs.h:1.5 src/sys/arch/arm/include/bus_funcs.h:1.6
--- src/sys/arch/arm/include/bus_funcs.h:1.5 Thu Jan 17 01:32:02 2013
+++ src/sys/arch/arm/include/bus_funcs.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_funcs.h,v 1.5 2013/01/17 01:32:02 matt Exp $ */
+/* $NetBSD: bus_funcs.h,v 1.6 2014/01/29 00:42:15 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -61,8 +61,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _ARM32_BUS_FUNCS_H_
-#define _ARM32_BUS_FUNCS_H_
+#ifndef _ARM_BUS_FUNCS_H_
+#define _ARM_BUS_FUNCS_H_
#ifdef _KERNEL_OPT
#include "opt_cputypes.h"
@@ -692,4 +692,4 @@ void _bus_dmatag_destroy(bus_dma_tag_t)
#endif /* _ARM32_BUS_DMA_PRIVATE */
-#endif /* _ARM32_BUS_FUNCS_H_ */
+#endif /* _ARM_BUS_FUNCS_H_ */
Index: src/sys/arch/arm/include/reg.h
diff -u src/sys/arch/arm/include/reg.h:1.5 src/sys/arch/arm/include/reg.h:1.6
--- src/sys/arch/arm/include/reg.h:1.5 Fri Jan 11 14:04:55 2013
+++ src/sys/arch/arm/include/reg.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: reg.h,v 1.5 2013/01/11 14:04:55 matt Exp $ */
+/* $NetBSD: reg.h,v 1.6 2014/01/29 00:42:15 matt Exp $ */
/*
* Copyright (C) 1994, 1995 Frank Lancaster
@@ -33,8 +33,8 @@
* @(#)reg.h 5.5 (Berkeley) 1/18/91
*/
-#ifndef _ARM32_REG_H_
-#define _ARM32_REG_H_
+#ifndef _ARM_REG_H_
+#define _ARM_REG_H_
struct reg {
unsigned int r[13];
@@ -57,4 +57,4 @@ struct fpreg {
};
-#endif /* !_ARM32_REG_H_ */
+#endif /* !_ARM_REG_H_ */
Index: src/sys/arch/arm/include/asm.h
diff -u src/sys/arch/arm/include/asm.h:1.25 src/sys/arch/arm/include/asm.h:1.26
--- src/sys/arch/arm/include/asm.h:1.25 Sat Nov 30 20:11:11 2013
+++ src/sys/arch/arm/include/asm.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.25 2013/11/30 20:11:11 matt Exp $ */
+/* $NetBSD: asm.h,v 1.26 2014/01/29 00:42:15 matt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -34,8 +34,8 @@
* from: @(#)asm.h 5.5 (Berkeley) 5/7/91
*/
-#ifndef _ARM32_ASM_H_
-#define _ARM32_ASM_H_
+#ifndef _ARM_ASM_H_
+#define _ARM_ASM_H_
#include <arm/cdefs.h>
Index: src/sys/arch/arm/include/bswap.h
diff -u src/sys/arch/arm/include/bswap.h:1.4 src/sys/arch/arm/include/bswap.h:1.5
--- src/sys/arch/arm/include/bswap.h:1.4 Tue Jan 31 07:49:18 2006
+++ src/sys/arch/arm/include/bswap.h Wed Jan 29 00:42:15 2014
@@ -1,11 +1,11 @@
-/* $NetBSD: bswap.h,v 1.4 2006/01/31 07:49:18 dsl Exp $ */
+/* $NetBSD: bswap.h,v 1.5 2014/01/29 00:42:15 matt Exp $ */
-#ifndef _MACHINE_BSWAP_H_
-#define _MACHINE_BSWAP_H_
+#ifndef _ARM_BSWAP_H_
+#define _ARM_BSWAP_H_
#include <arm/byte_swap.h>
#define __BSWAP_RENAME
#include <sys/bswap.h>
-#endif /* !_MACHINE_BSWAP_H_ */
+#endif /* !_ARM_BSWAP_H_ */
Index: src/sys/arch/arm/include/bus_defs.h
diff -u src/sys/arch/arm/include/bus_defs.h:1.9 src/sys/arch/arm/include/bus_defs.h:1.10
--- src/sys/arch/arm/include/bus_defs.h:1.9 Sat Feb 16 06:49:59 2013
+++ src/sys/arch/arm/include/bus_defs.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.9 2013/02/16 06:49:59 matt Exp $ */
+/* $NetBSD: bus_defs.h,v 1.10 2014/01/29 00:42:15 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -61,8 +61,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _ARM32_BUS_DEFS_H_
-#define _ARM32_BUS_DEFS_H_
+#ifndef _ARM_BUS_DEFS_H_
+#define _ARM_BUS_DEFS_H_
#if defined(_KERNEL_OPT)
#include "opt_arm_bus_space.h"
@@ -500,4 +500,4 @@ struct arm32_bus_dma_cookie {
#endif /* _ARM32_BUS_DMA_PRIVATE */
#define _BUS_DMA_MIGHT_NEED_BOUNCE 0x01 /* may need bounce buffers */
-#endif /* _ARM32_BUS_DEFS_H_ */
+#endif /* _ARM_BUS_DEFS_H_ */
Index: src/sys/arch/arm/include/int_types.h
diff -u src/sys/arch/arm/include/int_types.h:1.9 src/sys/arch/arm/include/int_types.h:1.10
--- src/sys/arch/arm/include/int_types.h:1.9 Fri Aug 29 19:08:29 2008
+++ src/sys/arch/arm/include/int_types.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_types.h,v 1.9 2008/08/29 19:08:29 matt Exp $ */
+/* $NetBSD: int_types.h,v 1.10 2014/01/29 00:42:15 matt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -31,8 +31,8 @@
* from: @(#)types.h 7.5 (Berkeley) 3/9/91
*/
-#ifndef _ARM32_INT_TYPES_H_
-#define _ARM32_INT_TYPES_H_
+#ifndef _ARM_INT_TYPES_H_
+#define _ARM_INT_TYPES_H_
#include <sys/cdefs.h>
@@ -65,4 +65,4 @@ typedef unsigned long long int __uint64_
typedef long int __intptr_t;
typedef unsigned long int __uintptr_t;
-#endif /* !_ARM32_INT_TYPES_H_ */
+#endif /* !_ARM_INT_TYPES_H_ */
Index: src/sys/arch/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.64 src/sys/arch/arm/include/cpufunc.h:1.65
--- src/sys/arch/arm/include/cpufunc.h:1.64 Wed Jun 12 01:16:48 2013
+++ src/sys/arch/arm/include/cpufunc.h Wed Jan 29 00:42:15 2014
@@ -39,8 +39,8 @@
* Prototypes for cpu, mmu and tlb related functions.
*/
-#ifndef _ARM32_CPUFUNC_H_
-#define _ARM32_CPUFUNC_H_
+#ifndef _ARM_CPUFUNC_H_
+#define _ARM_CPUFUNC_H_
#ifdef _KERNEL
@@ -779,6 +779,6 @@ u_int get_stackptr (u_int);
#endif /* _KERNEL || _KMEMUSER */
-#endif /* _ARM32_CPUFUNC_H_ */
+#endif /* _ARM_CPUFUNC_H_ */
/* End of cpufunc.h */
Index: src/sys/arch/arm/include/isa_machdep.h
diff -u src/sys/arch/arm/include/isa_machdep.h:1.10 src/sys/arch/arm/include/isa_machdep.h:1.11
--- src/sys/arch/arm/include/isa_machdep.h:1.10 Sat Oct 27 17:17:39 2012
+++ src/sys/arch/arm/include/isa_machdep.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.10 2012/10/27 17:17:39 chs Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.11 2014/01/29 00:42:15 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,8 +30,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _ARM32_ISA_MACHDEP_H_
-#define _ARM32_ISA_MACHDEP_H_
+#ifndef _ARM_ISA_MACHDEP_H_
+#define _ARM_ISA_MACHDEP_H_
#include <sys/bus.h>
#include <dev/isa/isadmavar.h>
@@ -143,4 +143,4 @@ void isa_intr_init(void);
void sysbeep(int, int); /* beep with the system speaker */
void isa_fillw(u_int val, void *addr, size_t len);
-#endif /* _ARM32_ISA_MACHDEP_H_ XXX */
+#endif /* _ARM_ISA_MACHDEP_H_ */
Index: src/sys/arch/arm/include/limits.h
diff -u src/sys/arch/arm/include/limits.h:1.15 src/sys/arch/arm/include/limits.h:1.16
--- src/sys/arch/arm/include/limits.h:1.15 Wed Jan 29 00:34:19 2014
+++ src/sys/arch/arm/include/limits.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.15 2014/01/29 00:34:19 matt Exp $ */
+/* $NetBSD: limits.h,v 1.16 2014/01/29 00:42:15 matt Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -31,8 +31,8 @@
* from: @(#)limits.h 7.2 (Berkeley) 6/28/90
*/
-#ifndef _ARM32_LIMITS_H_
-#define _ARM32_LIMITS_H_
+#ifndef _ARM_LIMITS_H_
+#define _ARM_LIMITS_H_
#include <sys/featuretest.h>
@@ -89,4 +89,4 @@
#define FLT_MIN 1.17549435E-38F
#endif
-#endif /* _ARM32_LIMITS_H_ */
+#endif /* _ARM_LIMITS_H_ */
Index: src/sys/arch/arm/include/proc.h
diff -u src/sys/arch/arm/include/proc.h:1.15 src/sys/arch/arm/include/proc.h:1.16
--- src/sys/arch/arm/include/proc.h:1.15 Wed Sep 11 04:24:48 2013
+++ src/sys/arch/arm/include/proc.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.15 2013/09/11 04:24:48 matt Exp $ */
+/* $NetBSD: proc.h,v 1.16 2014/01/29 00:42:15 matt Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -32,8 +32,8 @@
* SUCH DAMAGE.
*/
-#ifndef _ARM32_PROC_H_
-#define _ARM32_PROC_H_
+#ifndef _ARM_PROC_H_
+#define _ARM_PROC_H_
/*
* Machine-dependent part of the proc structure for arm.
@@ -61,4 +61,4 @@ struct mdproc {
#define PROC0_MD_INITIALIZERS .p_md = { .md_march = MACHINE_ARCH },
-#endif /* _ARM32_PROC_H_ */
+#endif /* _ARM_PROC_H_ */
Index: src/sys/arch/arm/include/ofw.h
diff -u src/sys/arch/arm/include/ofw.h:1.3 src/sys/arch/arm/include/ofw.h:1.4
--- src/sys/arch/arm/include/ofw.h:1.3 Sat Mar 14 14:45:55 2009
+++ src/sys/arch/arm/include/ofw.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.h,v 1.3 2009/03/14 14:45:55 dsl Exp $ */
+/* $NetBSD: ofw.h,v 1.4 2014/01/29 00:42:15 matt Exp $ */
/*
* Copyright 1997
@@ -33,8 +33,8 @@
* even if advised of the possibility of such damage.
*/
-#ifndef _MACHINE_OFW_H_
-#define _MACHINE_OFW_H_
+#ifndef _ARM_OFW_H_
+#define _ARM_OFW_H_
/* Virtual address range reserved for OFW. */
@@ -67,4 +67,4 @@ extern void cpu_reboot(int, char *);
extern void ofrootfound(void);
#endif
-#endif /* !_MACHINE_OFW_H_ */
+#endif /* !_ARM_OFW_H_ */
Index: src/sys/arch/arm/include/pio.h
diff -u src/sys/arch/arm/include/pio.h:1.2 src/sys/arch/arm/include/pio.h:1.3
--- src/sys/arch/arm/include/pio.h:1.2 Fri Jul 1 21:20:33 2011
+++ src/sys/arch/arm/include/pio.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pio.h,v 1.2 2011/07/01 21:20:33 dyoung Exp $ */
+/* $NetBSD: pio.h,v 1.3 2014/01/29 00:42:15 matt Exp $ */
/*
* Copyright 1997
@@ -33,8 +33,8 @@
* even if advised of the possibility of such damage.
*/
-#ifndef _ARM32_PIO_H_
-#define _ARM32_PIO_H_
+#ifndef _ARM_PIO_H_
+#define _ARM_PIO_H_
#include <sys/bus.h>
@@ -43,4 +43,4 @@ extern struct bus_space isa_io_bs_tag;
#define inb(port) bus_space_read_1( &isa_io_bs_tag, (bus_space_handle_t)isa_io_bs_tag.bs_cookie, (port))
#define outb(port, byte) bus_space_write_1(&isa_io_bs_tag, (bus_space_handle_t)isa_io_bs_tag.bs_cookie, (port), (byte))
-#endif /* _ARM32_PIO_H_ */
+#endif /* _ARM_PIO_H_ */
Index: src/sys/arch/arm/include/signal.h
diff -u src/sys/arch/arm/include/signal.h:1.12 src/sys/arch/arm/include/signal.h:1.13
--- src/sys/arch/arm/include/signal.h:1.12 Thu Jun 30 20:09:20 2011
+++ src/sys/arch/arm/include/signal.h Wed Jan 29 00:42:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.h,v 1.12 2011/06/30 20:09:20 wiz Exp $ */
+/* $NetBSD: signal.h,v 1.13 2014/01/29 00:42:15 matt Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -43,8 +43,8 @@
* Created : 30/09/94
*/
-#ifndef _ARM32_SIGNAL_H_
-#define _ARM32_SIGNAL_H_
+#ifndef _ARM_SIGNAL_H_
+#define _ARM_SIGNAL_H_
#include <sys/featuretest.h>
