[src/trunk]: src/sys/arch/arm/include Make multiple inclusion symbols always ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/arm/include Make multiple inclusion symbols always ...
From: matt <matt%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 01:55:05 +0000
details:   https://anonhg.NetBSD.org/src/rev/272fe4f864af
branches:  trunk
changeset: 793164:272fe4f864af
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Jan 29 00:42:15 2014 +0000

description:
Make multiple inclusion symbols always start with _ARM_ (not _ARM32_ or
_MACHINE_).

diffstat:

 sys/arch/arm/include/aout_machdep.h |  8 ++++----
 sys/arch/arm/include/asm.h          |  6 +++---
 sys/arch/arm/include/bswap.h        |  8 ++++----
 sys/arch/arm/include/bus_defs.h     |  8 ++++----
 sys/arch/arm/include/bus_funcs.h    |  8 ++++----
 sys/arch/arm/include/cpufunc.h      |  6 +++---
 sys/arch/arm/include/int_types.h    |  8 ++++----
 sys/arch/arm/include/isa_machdep.h  |  8 ++++----
 sys/arch/arm/include/limits.h       |  8 ++++----
 sys/arch/arm/include/ofw.h          |  8 ++++----
 sys/arch/arm/include/pio.h          |  8 ++++----
 sys/arch/arm/include/proc.h         |  8 ++++----
 sys/arch/arm/include/reg.h          |  8 ++++----
 sys/arch/arm/include/signal.h       |  6 +++---
 14 files changed, 53 insertions(+), 53 deletions(-)

diffs (truncated from 341 to 300 lines):

diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/aout_machdep.h
--- a/sys/arch/arm/include/aout_machdep.h       Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/aout_machdep.h       Wed Jan 29 00:42:15 2014 +0000
@@ -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 @@
 /* No special executable format */
 #define        cpu_exec_aout_makecmds(a, b)    ENOEXEC
 
-#endif /* _ARM32_AOUT_MACHDEP_H_ */
+#endif /* _ARM_AOUT_MACHDEP_H_ */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/asm.h
--- a/sys/arch/arm/include/asm.h        Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/asm.h        Wed Jan 29 00:42:15 2014 +0000
@@ -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>
 
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/bswap.h
--- a/sys/arch/arm/include/bswap.h      Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/bswap.h      Wed Jan 29 00:42:15 2014 +0000
@@ -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_ */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/bus_defs.h
--- a/sys/arch/arm/include/bus_defs.h   Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/bus_defs.h   Wed Jan 29 00:42:15 2014 +0000
@@ -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 @@
 #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_ */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/bus_funcs.h
--- a/sys/arch/arm/include/bus_funcs.h  Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/bus_funcs.h  Wed Jan 29 00:42:15 2014 +0000
@@ -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 @@
 
 #endif /* _ARM32_BUS_DMA_PRIVATE */
 
-#endif /* _ARM32_BUS_FUNCS_H_ */
+#endif /* _ARM_BUS_FUNCS_H_ */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/cpufunc.h
--- a/sys/arch/arm/include/cpufunc.h    Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/cpufunc.h    Wed Jan 29 00:42:15 2014 +0000
@@ -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 @@
 
 #endif /* _KERNEL || _KMEMUSER */
 
-#endif /* _ARM32_CPUFUNC_H_ */
+#endif /* _ARM_CPUFUNC_H_ */
 
 /* End of cpufunc.h */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/int_types.h
--- a/sys/arch/arm/include/int_types.h  Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/int_types.h  Wed Jan 29 00:42:15 2014 +0000
@@ -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 long int              __intptr_t;
 typedef unsigned long int     __uintptr_t;
 
-#endif /* !_ARM32_INT_TYPES_H_ */
+#endif /* !_ARM_INT_TYPES_H_ */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/isa_machdep.h
--- a/sys/arch/arm/include/isa_machdep.h        Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/isa_machdep.h        Wed Jan 29 00:42:15 2014 +0000
@@ -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 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_ */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/limits.h
--- a/sys/arch/arm/include/limits.h     Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/limits.h     Wed Jan 29 00:42:15 2014 +0000
@@ -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_ */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/ofw.h
--- a/sys/arch/arm/include/ofw.h        Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/ofw.h        Wed Jan 29 00:42:15 2014 +0000
@@ -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 ofrootfound(void);
 #endif
 
-#endif /* !_MACHINE_OFW_H_ */
+#endif /* !_ARM_OFW_H_ */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/pio.h
--- a/sys/arch/arm/include/pio.h        Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/pio.h        Wed Jan 29 00:42:15 2014 +0000
@@ -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 @@
 #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_ */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/proc.h
--- a/sys/arch/arm/include/proc.h       Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/proc.h       Wed Jan 29 00:42:15 2014 +0000
@@ -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 @@
 
 #define        PROC0_MD_INITIALIZERS .p_md = { .md_march = MACHINE_ARCH },
 
-#endif /* _ARM32_PROC_H_ */
+#endif /* _ARM_PROC_H_ */
diff -r 3d886779b2b1 -r 272fe4f864af sys/arch/arm/include/reg.h
--- a/sys/arch/arm/include/reg.h        Wed Jan 29 00:34:19 2014 +0000
+++ b/sys/arch/arm/include/reg.h        Wed Jan 29 00:42:15 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: reg.h,v 1.5 2013/01/11 14:04:55 matt Exp $     */
Prev by Date: [src/trunk]: src/sys/arch/arm/include replace spaces in SHRT_MIN definition w...
Next by Date: [src/trunk]: src/sys/arch/arm/include Also test for __AARCH64EB__ as well as ...
Previous by Thread: [src/trunk]: src/sys/arch/arm/include replace spaces in SHRT_MIN definition w...
Next by Thread: [src/trunk]: src/sys/arch/arm/include Also test for __AARCH64EB__ as well as ...
Indexes:
Home | Main Index | Thread Index | Old Index