Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/pmax/include - Fix RCS Ids.
details: https://anonhg.NetBSD.org/src/rev/a9782aab2671
branches: trunk
changeset: 480329:a9782aab2671
user: ad <ad%NetBSD.org@localhost>
date: Sun Jan 09 15:34:41 2000 +0000
description:
- Fix RCS Ids.
- Spacing.
- Protect from multiple inclusion in a consistant way (except on headers
that do nothing except function as mips header wrappers).
diffstat:
sys/arch/pmax/include/autoconf.h | 7 ++++++-
sys/arch/pmax/include/bootinfo.h | 7 ++++++-
sys/arch/pmax/include/bswap.h | 2 +-
sys/arch/pmax/include/bus.h | 4 ++--
sys/arch/pmax/include/clock_machdep.h | 6 +++++-
sys/arch/pmax/include/conf.h | 9 ++++++---
sys/arch/pmax/include/cpu.h | 8 ++++----
sys/arch/pmax/include/db_machdep.h | 7 ++++++-
sys/arch/pmax/include/dc7085cons.h | 8 ++++----
sys/arch/pmax/include/dec_boot.h | 7 ++++++-
sys/arch/pmax/include/dec_exec.h | 8 ++++++--
sys/arch/pmax/include/dec_prom.h | 8 ++++----
sys/arch/pmax/include/disklabel.h | 8 ++++----
sys/arch/pmax/include/elf_machdep.h | 11 +++++++----
sys/arch/pmax/include/endian.h | 7 ++++++-
sys/arch/pmax/include/fbio.h | 7 ++++++-
sys/arch/pmax/include/fbvar.h | 7 ++++++-
sys/arch/pmax/include/intr.h | 4 ++--
sys/arch/pmax/include/limits.h | 8 ++++----
sys/arch/pmax/include/loadfile_machdep.h | 7 ++++++-
sys/arch/pmax/include/locore.h | 7 ++++++-
sys/arch/pmax/include/mips_opcode.h | 7 +------
sys/arch/pmax/include/param.h | 7 ++++++-
sys/arch/pmax/include/pmap.h | 11 ++++++++---
sys/arch/pmax/include/pmioctl.h | 7 ++++++-
sys/arch/pmax/include/reloc.h | 7 ++++++-
sys/arch/pmax/include/sysconf.h | 8 ++++----
sys/arch/pmax/include/tc_machdep.h | 8 ++++----
sys/arch/pmax/include/vmparam.h | 4 ++--
29 files changed, 140 insertions(+), 66 deletions(-)
diffs (truncated from 638 to 300 lines):
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/autoconf.h
--- a/sys/arch/pmax/include/autoconf.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/autoconf.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.16 2000/01/09 13:24:16 simonb Exp $ */
+/* $NetBSD: autoconf.h,v 1.17 2000/01/09 15:34:41 ad Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -27,6 +27,9 @@
* rights to redistribute these changes.
*/
+#ifndef _PMAX_AUTOCONF_H_
+#define _PMAX_AUTOCONF_H_
+
/*
* Machine-dependent structures of autoconfiguration
*/
@@ -38,3 +41,5 @@
};
void makebootdev __P((char *));
+
+#endif /* !_PMAX_AUTOCONF_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/bootinfo.h
--- a/sys/arch/pmax/include/bootinfo.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/bootinfo.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.4 2000/01/08 01:02:38 simonb Exp $ */
+/* $NetBSD: bootinfo.h,v 1.5 2000/01/09 15:34:41 ad Exp $ */
/*
* Copyright (c) 1997
@@ -32,6 +32,9 @@
*
*/
+#ifndef _PMAX_BOOTINFO_H_
+#define _PMAX_BOOTINFO_H_
+
#define BOOTINFO_MAGIC 0xb007babe
#define BOOTINFO_SIZE 1024
@@ -71,3 +74,5 @@
#ifdef _KERNEL
void *lookup_bootinfo __P((int));
#endif
+
+#endif /* !_PMAX_BOOTINFO_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/bswap.h
--- a/sys/arch/pmax/include/bswap.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/bswap.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,3 +1,3 @@
-/* from $NetBSD: bswap.h,v 1.1 1999/01/15 13:31:27 bouyer Exp $ */
+/* $NetBSD: bswap.h,v 1.2 2000/01/09 15:34:41 ad Exp $ */
#include <mips/bswap.h>
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/bus.h
--- a/sys/arch/pmax/include/bus.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/bus.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.9 1999/04/08 03:14:35 nisimura Exp $ */
+/* $NetBSD: bus.h,v 1.10 2000/01/09 15:34:42 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -643,4 +643,4 @@
extern struct pmax_bus_dma_tag pmax_default_bus_dma_tag;
#endif /* _PMAX_BUS_DMA_PRIVATE */
-#endif /* _PMAX_BUS_H_ */
+#endif /* !_PMAX_BUS_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/clock_machdep.h
--- a/sys/arch/pmax/include/clock_machdep.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/clock_machdep.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_machdep.h,v 1.4 1999/08/25 02:12:05 simonb Exp $ */
+/* $NetBSD: clock_machdep.h,v 1.5 2000/01/09 15:34:42 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -48,6 +48,10 @@
* the acutal RTC hardware in use. clock
*/
+#ifndef _PMAX_CLOCK_MACHDEP_H_
+#define _PMAX_CLOCK_MACHDEP_H_
/* The default clock rate on a pmax is 256 Hz. */
#define CLOCK_RATE 256
+
+#endif /* !_PMAX_CLOCK_MACHDEP_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/conf.h
--- a/sys/arch/pmax/include/conf.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/conf.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,5 +1,4 @@
-/* $NetBSD: conf.h,v 1.3 2000/01/09 03:55:52 simonb Exp $ */
-
+/* $NetBSD: conf.h,v 1.4 2000/01/09 15:34:42 ad Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -16,11 +15,13 @@
* This file contributed by Jonathan Stone.
*/
+#ifndef _PMAX_CONF_H_
+#define _PMAX_CONF_H_
+
#define mmread mmrw
#define mmwrite mmrw
cdev_decl(mm);
-
cdev_decl(scc); /* pmax (also alpha m-d z8530 SCC */
cdev_decl(dc); /* dc7085 dz11-on-a-chip */
@@ -34,3 +35,5 @@
cdev_decl(fb); /* generic framebuffer pseudo-device */
cdev_decl(rcons); /* framebuffer-based raster console pseudo-device */
cdev_decl(px); /* PixelStamp framebuffers */
+
+#endif /* !_PMAX_CONF_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/cpu.h
--- a/sys/arch/pmax/include/cpu.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/cpu.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: cpu.h,v 1.19 1999/01/16 02:36:01 nisimura Exp $ */
+/* $NetBSD: cpu.h,v 1.20 2000/01/09 15:34:42 ad Exp $ */
-#ifndef __PMAX_CPU_H
-#define __PMAX_CPU_H
+#ifndef _PMAX_CPU_H_
+#define _PMAX_CPU_H_
/*
* pmax uses standard mips1 convention, wiring FPU to hard interupt 5.
@@ -14,4 +14,4 @@
#define INT_MASK_REAL_DEV (MIPS_HARD_INT_MASK &~ MIPS_INT_MASK_5)
#define INT_MASK_FPU_DEAL MIPS_INT_MASK_5
-#endif __PMAX_CPU_H
+#endif /* !_PMAX_CPU_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/db_machdep.h
--- a/sys/arch/pmax/include/db_machdep.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/db_machdep.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,7 +1,12 @@
-/* $NetBSD: db_machdep.h,v 1.2 1999/03/23 22:07:07 simonb Exp $ */
+/* $NetBSD: db_machdep.h,v 1.3 2000/01/09 15:34:42 ad Exp $ */
+
+#ifndef _PMAX_DB_MACHDEP_H_
+#define _PMAX_DB_MACHDEP_H_
#define DB_ELF_SYMBOLS
#define DB_ELFSIZE 32
#define DB_AOUT_SYMBOLS
#include <mips/db_machdep.h>
+
+#endif /* !_PMAX_DB_MACHDEP_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/dc7085cons.h
--- a/sys/arch/pmax/include/dc7085cons.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/dc7085cons.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dc7085cons.h,v 1.5 1999/04/24 08:01:10 simonb Exp $ */
+/* $NetBSD: dc7085cons.h,v 1.6 2000/01/09 15:34:42 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -54,8 +54,8 @@
* v 1.4 89/08/15 19:52:46 rab Exp SPRITE (DECWRL)
*/
-#ifndef _DC7085
-#define _DC7085
+#ifndef _PMAX_DC7085CONS_H_
+#define _PMAX_DC7085CONS_H_
typedef volatile struct dc7085regs {
u_short dc_csr; /* control and status (R/W) */
@@ -168,4 +168,4 @@
#define DML_DTR 0000002 /* data terminal ready */
#define DML_LE 0000001 /* line enable */
-#endif /* _DC7085 */
+#endif /* !_PMAX_DC7085CONS_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/dec_boot.h
--- a/sys/arch/pmax/include/dec_boot.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/dec_boot.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_boot.h,v 1.8 1999/11/27 01:51:20 simonb Exp $ */
+/* $NetBSD: dec_boot.h,v 1.9 2000/01/09 15:34:42 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -49,6 +49,9 @@
* v 9.4 90/03/01 12:22:36 jhh Exp SPRITE (Berkeley)
*/
+#ifndef _PMAX_DEC_BOOT_H_
+#define _PMAX_DEC_BOOT_H_
+
/*
* Boot block information on the 0th sector.
* The boot program is stored in sequences of contiguous blocks.
@@ -115,3 +118,5 @@
#define DEC_LABEL_MAGIC 0x00032957
#define DEC_LABEL_SECTOR 31
+
+#endif /* !_PMAX_DEC_BOOT_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/dec_exec.h
--- a/sys/arch/pmax/include/dec_exec.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/dec_exec.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_exec.h,v 1.5 1999/04/24 08:01:10 simonb Exp $ */
+/* $NetBSD: dec_exec.h,v 1.6 2000/01/09 15:34:42 ad Exp $ */
/*-
* Copyright (c) 1993
@@ -38,7 +38,6 @@
* @(#)dec_exec.h 8.1 (Berkeley) 6/10/93
*/
-
/*
* Portions of this file are subject to the following copyright notice:
*
@@ -56,6 +55,9 @@
* shirriff Exp SPRITE (Berkeley)
*/
+#ifndef _PMAX_DEC_EXEC_H_
+#define _PMAX_DEC_EXEC_H_
+
/* Description of the COFF section. */
struct coff_exec {
#define COFF_MAGIC 0x0162
@@ -97,3 +99,5 @@
u_short numLnno; /* Numberof gp tables. */
long flags; /* Section flags. */
} ProcSectionHeader;
+
+#endif /* !_PMAX_DEC_EXEC_H_ */
\ No newline at end of file
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/dec_prom.h
--- a/sys/arch/pmax/include/dec_prom.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/dec_prom.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_prom.h,v 1.14 1999/03/01 04:01:50 simonb Exp $ */
+/* $NetBSD: dec_prom.h,v 1.15 2000/01/09 15:34:42 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -53,8 +53,8 @@
* v 9.3 90/02/20 14:34:07 shirriff Exp SPRITE (Berkeley)
*/
-#ifndef _DEC_PROM
-#define _DEC_PROM
+#ifndef _PMAX_DEC_PROM_H_
+#define _PMAX_DEC_PROM_H_
/*
* This file was created based on information from the document
@@ -337,4 +337,4 @@
#define DEC_REX_MAGIC 0x30464354 /* REX Magic number */
-#endif /* _DEC_PROM */
+#endif /* !_PMAX_DEC_PROM_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/disklabel.h
--- a/sys/arch/pmax/include/disklabel.h Sun Jan 09 15:12:31 2000 +0000
+++ b/sys/arch/pmax/include/disklabel.h Sun Jan 09 15:34:41 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.3 1999/11/27 01:58:37 simonb Exp $ */
+/* $NetBSD: disklabel.h,v 1.4 2000/01/09 15:34:42 ad Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -30,8 +30,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _MACHINE_DISKLABEL_H_
-#define _MACHINE_DISKLABEL_H_
+#ifndef _PMAX_DISKLABEL_H_
+#define _PMAX_DISKLABEL_H_
#define LABELSECTOR 0 /* sector containing label */
#define LABELOFFSET 64 /* offset of label in sector */
@@ -43,4 +43,4 @@
int cd_dummy; /* must have one element. */
};
-#endif /* _MACHINE_DISKLABEL_H_ */
+#endif /* !_PMAX_DISKLABEL_H_ */
diff -r eca67d2de973 -r a9782aab2671 sys/arch/pmax/include/elf_machdep.h
--- a/sys/arch/pmax/include/elf_machdep.h Sun Jan 09 15:12:31 2000 +0000
Home |
Main Index |
Thread Index |
Old Index