diff options
Diffstat (limited to 'sys/arch/mvme88k/include')
| -rw-r--r-- | sys/arch/mvme88k/include/ansi.h | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/board.h | 6 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/cpus.h | 22 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/disklabel.h | 6 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/exec.h | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/ieeefp.h | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/intr.h | 8 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/mvme188.h | 12 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/pcb.h | 8 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/pmap.h | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/prom.h | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/psl.h | 4 |
12 files changed, 41 insertions, 45 deletions
diff --git a/sys/arch/mvme88k/include/ansi.h b/sys/arch/mvme88k/include/ansi.h index 39aedc8cde0..809c570acf5 100644 --- a/sys/arch/mvme88k/include/ansi.h +++ b/sys/arch/mvme88k/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.15 2003/08/01 07:44:05 miod Exp $ */ +/* $OpenBSD: ansi.h,v 1.16 2003/10/11 22:08:57 miod Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -61,7 +61,7 @@ struct __va_list_tag; * chosen over a long is that the is*() and to*() routines take ints (says * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you * lose a bit of ANSI conformance, but your programs will still work. - * + * * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains * defined for ctype.h. diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h index 4b69c4e73ce..d30f9dc63ba 100644 --- a/sys/arch/mvme88k/include/board.h +++ b/sys/arch/mvme88k/include/board.h @@ -1,4 +1,4 @@ -/* $OpenBSD: board.h,v 1.17 2003/09/28 16:01:11 miod Exp $ */ +/* $OpenBSD: board.h,v 1.18 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -62,7 +62,7 @@ #define VMEA32D16_SIZE 0x007FFFFF /* VMEbus A32/D16 size */ -/* These need to be here because of the way m18x_cmmu.c +/* These need to be here because of the way m18x_cmmu.c handles the CMMU's. */ #define CMMU_SIZE 0x1000 @@ -99,7 +99,7 @@ #endif #ifdef MVME187 #include <machine/mvme187.h> -#endif +#endif #ifdef MVME188 #include <machine/mvme188.h> #endif diff --git a/sys/arch/mvme88k/include/cpus.h b/sys/arch/mvme88k/include/cpus.h index ecf5bd9e2d5..4de514f31ae 100644 --- a/sys/arch/mvme88k/include/cpus.h +++ b/sys/arch/mvme88k/include/cpus.h @@ -1,35 +1,31 @@ -/* $OpenBSD: cpus.h,v 1.11 2001/12/19 07:04:41 smurph Exp $ */ -/* +/* $OpenBSD: cpus.h,v 1.12 2003/10/11 22:08:57 miod Exp $ */ +/* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon + * + * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ /* - * - * HISTORY - */ -/* - Versions Idents for 88k family chips + * Versions Idents for 88k family chips */ #ifndef __MACHINE_CPUS_H__ diff --git a/sys/arch/mvme88k/include/disklabel.h b/sys/arch/mvme88k/include/disklabel.h index 0e7cbd6592c..d7ae09fbec9 100644 --- a/sys/arch/mvme88k/include/disklabel.h +++ b/sys/arch/mvme88k/include/disklabel.h @@ -1,9 +1,9 @@ -/* $OpenBSD: disklabel.h,v 1.10 2003/06/03 21:09:01 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.11 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1995 Dale Rahn. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,7 +25,7 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + */ #ifndef __MACHINE_DISKLABEL_H__ #define __MACHINE_DISKLABEL_H__ diff --git a/sys/arch/mvme88k/include/exec.h b/sys/arch/mvme88k/include/exec.h index 760e511cfca..f1d8d097898 100644 --- a/sys/arch/mvme88k/include/exec.h +++ b/sys/arch/mvme88k/include/exec.h @@ -1,10 +1,10 @@ -/* $OpenBSD: exec.h,v 1.10 2001/08/12 12:03:02 heko Exp $ */ +/* $OpenBSD: exec.h,v 1.11 2003/10/11 22:08:57 miod Exp $ */ #ifndef __MACHINE_EXEC_H__ #define __MACHINE_EXEC_H__ #define __LDPGSZ 4096 -struct relocation_info_m88k { +struct relocation_info_m88k { unsigned int r_address; /* offset in text or data segment */ unsigned int r_symbolnum : 24, /* ordinal number of add symbol */ r_extern : 1, /* 1 if need to add symbol to value */ diff --git a/sys/arch/mvme88k/include/ieeefp.h b/sys/arch/mvme88k/include/ieeefp.h index ace84509abc..f70461fbca2 100644 --- a/sys/arch/mvme88k/include/ieeefp.h +++ b/sys/arch/mvme88k/include/ieeefp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieeefp.h,v 1.3 2003/09/26 21:43:30 miod Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.4 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -33,7 +33,7 @@ * Values for fp_except are selected to match the bits in FPSR (see * m88100 user's manual page 6-33). This file is derived from the * definitions in the ABI/88k manual and sparc port. - * -- Nivas + * -- Nivas */ #ifndef _M88K_IEEEFP_H_ diff --git a/sys/arch/mvme88k/include/intr.h b/sys/arch/mvme88k/include/intr.h index 8c2754c8b77..197d25aa8f4 100644 --- a/sys/arch/mvme88k/include/intr.h +++ b/sys/arch/mvme88k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.12 2003/01/13 20:12:16 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.13 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -46,8 +46,8 @@ #define M88K_LEVEL5_IRQ 5 #define M88K_LEVEL6_IRQ 6 #define M88K_LEVEL7_IRQ 7 -/* - * We keep track of these separately, but +/* + * We keep track of these separately, but * they will be reflected with the above also. */ #define M88K_CLK_IRQ 8 @@ -57,7 +57,7 @@ extern int intrcnt[M88K_NIRQ]; -#endif +#endif /* * IPL levels. diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h index 16186a0daef..6c82fa61556 100644 --- a/sys/arch/mvme88k/include/mvme188.h +++ b/sys/arch/mvme88k/include/mvme188.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mvme188.h,v 1.14 2003/09/28 16:01:12 miod Exp $ */ +/* $OpenBSD: mvme188.h,v 1.15 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -253,10 +253,10 @@ #define SLAVE_MASK (LVL6 | LVL1) #define MASK_LVL_0 (LVL7 | LVL6 | LVL5 | LVL4 | LVL3 | LVL2 | LVL1) -#define MASK_LVL_1 (LVL7 | LVL6 | LVL5 | LVL4 | LVL3 | LVL2) -#define MASK_LVL_2 (LVL7 | LVL6 | LVL5 | LVL4 | LVL3) -#define MASK_LVL_3 (LVL7 | LVL6 | LVL5 | LVL4) -#define MASK_LVL_4 (LVL7 | LVL6 | LVL5) +#define MASK_LVL_1 (LVL7 | LVL6 | LVL5 | LVL4 | LVL3 | LVL2) +#define MASK_LVL_2 (LVL7 | LVL6 | LVL5 | LVL4 | LVL3) +#define MASK_LVL_3 (LVL7 | LVL6 | LVL5 | LVL4) +#define MASK_LVL_4 (LVL7 | LVL6 | LVL5) #define MASK_LVL_5 (LVL7 | LVL6) #define MASK_LVL_6 (LVL7) #define MASK_LVL_7 0x00000000 /* all ints disabled */ @@ -364,7 +364,7 @@ extern unsigned int int_mask_val[INT_LEVEL]; extern unsigned int int_mask_shadow[MAX_CPUS]; extern unsigned int *volatile int_mask_reg[MAX_CPUS]; -#endif +#endif #define M188_IACK 0xFFF85000 #define M188_IVEC 0x40 /* vector returned upon MVME188 int */ diff --git a/sys/arch/mvme88k/include/pcb.h b/sys/arch/mvme88k/include/pcb.h index 4e7e3a2d9fa..6f6395d8d8a 100644 --- a/sys/arch/mvme88k/include/pcb.h +++ b/sys/arch/mvme88k/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.9 2001/09/28 20:46:39 miod Exp $ */ +/* $OpenBSD: pcb.h,v 1.10 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Mach Operating System @@ -25,8 +25,8 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ -/* - * Motorola 88100 pcb definitions +/* + * Motorola 88100 pcb definitions * */ /* @@ -36,7 +36,7 @@ #include <machine/reg.h> -/* +/* * Our PCB is the regular PCB+Save area for kernel frame. * Upon entering kernel mode from user land, save the user context * in the saved_state area - this is passed as the exception frame. diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h index 83aa964865e..5d5a3948f69 100644 --- a/sys/arch/mvme88k/include/pmap.h +++ b/sys/arch/mvme88k/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.30 2003/09/26 22:27:25 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.31 2003/10/11 22:08:57 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1991 Carnegie Mellon University @@ -37,7 +37,7 @@ struct pmap { u_int32_t pm_ibatc[BATC_MAX]; /* instruction BATCs */ u_int32_t pm_dbatc[BATC_MAX]; /* data BATCs */ #endif -}; +}; #define PMAP_NULL ((pmap_t) 0) diff --git a/sys/arch/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h index 551213cffd7..d7aa62e8b64 100644 --- a/sys/arch/mvme88k/include/prom.h +++ b/sys/arch/mvme88k/include/prom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prom.h,v 1.11 2003/09/01 19:14:04 miod Exp $ */ +/* $OpenBSD: prom.h,v 1.12 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -109,7 +109,7 @@ struct mvmeprom_brdid { u_char pwa[16]; /* printed wiring assembly number */ u_char speed[4]; /* cpu speed */ u_char etheraddr[6]; /* mac address, all zero if no ether */ - u_char fill[2]; + u_char fill[2]; u_char scsiid[2]; /* local SCSI id */ u_char sysid[8]; /* system id - nothing on mvme187 */ u_char brd1_pwb[8]; /* memory board 1 pwb */ diff --git a/sys/arch/mvme88k/include/psl.h b/sys/arch/mvme88k/include/psl.h index b963bc44e62..b900b9d71cf 100644 --- a/sys/arch/mvme88k/include/psl.h +++ b/sys/arch/mvme88k/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.13 2003/09/26 19:04:28 miod Exp $ */ +/* $OpenBSD: psl.h,v 1.14 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -46,7 +46,7 @@ #ifndef __M88K_PSL_H__ #define __M88K_PSL_H__ -/* +/* * 88100 control registers */ |