diff options
Diffstat (limited to 'sys/arch/mips64/include')
-rw-r--r-- | sys/arch/mips64/include/ansi.h | 4 | ||||
-rw-r--r-- | sys/arch/mips64/include/arcbios.h | 10 | ||||
-rw-r--r-- | sys/arch/mips64/include/archtype.h | 8 | ||||
-rw-r--r-- | sys/arch/mips64/include/asm.h | 8 | ||||
-rw-r--r-- | sys/arch/mips64/include/cpu.h | 8 | ||||
-rw-r--r-- | sys/arch/mips64/include/cpustate.h | 6 | ||||
-rw-r--r-- | sys/arch/mips64/include/db_machdep.h | 4 | ||||
-rw-r--r-- | sys/arch/mips64/include/endian.h | 4 | ||||
-rw-r--r-- | sys/arch/mips64/include/exception.h | 4 | ||||
-rw-r--r-- | sys/arch/mips64/include/frame.h | 4 | ||||
-rw-r--r-- | sys/arch/mips64/include/ieeefp.h | 4 | ||||
-rw-r--r-- | sys/arch/mips64/include/link.h | 13 | ||||
-rw-r--r-- | sys/arch/mips64/include/param.h | 12 | ||||
-rw-r--r-- | sys/arch/mips64/include/pio.h | 8 | ||||
-rw-r--r-- | sys/arch/mips64/include/pmap.h | 6 | ||||
-rw-r--r-- | sys/arch/mips64/include/regnum.h | 4 | ||||
-rw-r--r-- | sys/arch/mips64/include/signal.h | 4 | ||||
-rw-r--r-- | sys/arch/mips64/include/trap.h | 4 | ||||
-rw-r--r-- | sys/arch/mips64/include/vmparam.h | 6 |
19 files changed, 60 insertions, 61 deletions
diff --git a/sys/arch/mips64/include/ansi.h b/sys/arch/mips64/include/ansi.h index c80b1bc0650..6cc8903a530 100644 --- a/sys/arch/mips64/include/ansi.h +++ b/sys/arch/mips64/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: ansi.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -69,7 +69,7 @@ * 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/mips64/include/arcbios.h b/sys/arch/mips64/include/arcbios.h index bb6bb2411b4..ab27bb3d9d3 100644 --- a/sys/arch/mips64/include/arcbios.h +++ b/sys/arch/mips64/include/arcbios.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arcbios.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: arcbios.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /*- * Copyright (c) 1996 M. Warner Losh. All rights reserved. * @@ -108,7 +108,7 @@ typedef struct arc_config u_int32_t affinity_mask; u_int32_t config_data_len; u_int32_t id_len; - char *id; + char *id; } arc_config_t; typedef enum arc_status @@ -215,7 +215,7 @@ typedef struct arc_calls volatile void (*return_from_main)(void); /* ReturnFromMain 9 */ arc_config_t *(*get_peer)( /* GetPeer 10 */ - arc_config_t *); /* Component */ + arc_config_t *); /* Component */ arc_config_t *(*get_child)( /* GetChild 11 */ arc_config_t *); /* Component */ @@ -288,7 +288,7 @@ typedef struct arc_calls arc_status_t (*seek)( /* Seek 29 */ u_int32_t, /* FileId */ int64_t *, /* Offset */ - arc_seek_mode_t); /* Mode */ + arc_seek_mode_t); /* Mode */ arc_status_t (*mount)( /* Mount 30 */ char *, /* Path */ @@ -320,7 +320,7 @@ typedef struct arc_calls #define ARC_PARAM_BLK_MAGIC 0x53435241 #define ARC_PARAM_BLK_MAGIC_BUG 0x41524353 /* This is wrong... but req */ -typedef struct arc_param_blk +typedef struct arc_param_blk { u_int32_t magic; /* Magic Number */ u_int32_t length; /* Length of parameter block */ diff --git a/sys/arch/mips64/include/archtype.h b/sys/arch/mips64/include/archtype.h index 1d87f2cd6a9..5e56d6aaaba 100644 --- a/sys/arch/mips64/include/archtype.h +++ b/sys/arch/mips64/include/archtype.h @@ -1,7 +1,7 @@ -/* $OpenBSD: archtype.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: archtype.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1997-2003 Opsycon AB, Sweden (www.opsycon.se) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -77,8 +77,8 @@ #define WG8168 0x0056 /* Willowglen 8168 5231 VME card */ #define WG6000 0x0057 /* Willowglen CPU-6000 */ #define WG7000 0x0058 /* Willowglen CPU-7000 */ -#define WG8200 0x0059 /* Willowglen CPU-8200 */ -#define WG8232 0x005a /* Willowglen CPU-8232 */ +#define WG8200 0x0059 /* Willowglen CPU-8200 */ +#define WG8232 0x005a /* Willowglen CPU-8232 */ #define MISC_CLASS 0x00F0 /* Misc machines... */ #define LAGUNA 0x00F1 /* Heurikon Laguna VME board */ diff --git a/sys/arch/mips64/include/asm.h b/sys/arch/mips64/include/asm.h index 8816f1227c9..6efa9871642 100644 --- a/sys/arch/mips64/include/asm.h +++ b/sys/arch/mips64/include/asm.h @@ -1,8 +1,8 @@ -/* $OpenBSD: asm.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: asm.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -54,7 +54,7 @@ #error "__MIPSEL__ or __MIPSEB__ must be defined" #endif /* - * Define how to access unaligned data word + * Define how to access unaligned data word */ #if defined(__MIPSEL__) #define LWLO lwl @@ -181,7 +181,7 @@ */ #if defined(XGPROF) || defined(XPROF) #define MCOUNT \ - subu sp, sp, 32; \ + subu sp, sp, 32; \ SAVE_GP(16); \ sw ra, 28(sp); \ sw gp, 24(sp); \ diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h index 117c8aa194f..c181b418684 100644 --- a/sys/arch/mips64/include/cpu.h +++ b/sys/arch/mips64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: cpu.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -65,10 +65,10 @@ #define KSEG_SIZE 0x20000000 #define KSEG0_TO_PHYS(x) ((u_long)(x) & 0x1fffffff) -#define KSEG1_TO_PHYS(x) ((u_long)(x) & 0x1fffffff) +#define KSEG1_TO_PHYS(x) ((u_long)(x) & 0x1fffffff) #define PHYS_TO_KSEG0(x) ((u_long)(x) | KSEG0_BASE) -#define PHYS_TO_KSEG1(x) ((u_long)(x) | KSEG1_BASE) -#define PHYS_TO_KSEG3(x) ((u_long)(x) | KSEG3_BASE) +#define PHYS_TO_KSEG1(x) ((u_long)(x) | KSEG1_BASE) +#define PHYS_TO_KSEG3(x) ((u_long)(x) | KSEG3_BASE) #ifdef _KERNEL diff --git a/sys/arch/mips64/include/cpustate.h b/sys/arch/mips64/include/cpustate.h index a94c7269ce4..178320c418c 100644 --- a/sys/arch/mips64/include/cpustate.h +++ b/sys/arch/mips64/include/cpustate.h @@ -1,8 +1,8 @@ -/* $OpenBSD: cpustate.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: cpustate.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2002-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -128,7 +128,7 @@ RESTORE_REG(t8, T8, frame, bo) ;\ RESTORE_REG(t9, T9, frame, bo) ;\ RESTORE_REG(gp, GP, frame, bo) ;\ - RESTORE_REG(ra, RA, frame, bo) + RESTORE_REG(ra, RA, frame, bo) /* * Restore 'callee save' registers diff --git a/sys/arch/mips64/include/db_machdep.h b/sys/arch/mips64/include/db_machdep.h index 4502318d9af..731ec862147 100644 --- a/sys/arch/mips64/include/db_machdep.h +++ b/sys/arch/mips64/include/db_machdep.h @@ -1,8 +1,8 @@ -/* $OpenBSD: db_machdep.h,v 1.2 2004/08/10 20:07:15 pefo Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/arch/mips64/include/endian.h b/sys/arch/mips64/include/endian.h index ddd520dcb9b..55c63a95ca4 100644 --- a/sys/arch/mips64/include/endian.h +++ b/sys/arch/mips64/include/endian.h @@ -1,8 +1,8 @@ -/* $OpenBSD: endian.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: endian.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/arch/mips64/include/exception.h b/sys/arch/mips64/include/exception.h index 3fd4792f7b5..a4bf0439683 100644 --- a/sys/arch/mips64/include/exception.h +++ b/sys/arch/mips64/include/exception.h @@ -1,8 +1,8 @@ -/* $OpenBSD: exception.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: exception.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/arch/mips64/include/frame.h b/sys/arch/mips64/include/frame.h index 21bb05b7940..5ee47861e7b 100644 --- a/sys/arch/mips64/include/frame.h +++ b/sys/arch/mips64/include/frame.h @@ -1,8 +1,8 @@ -/* $OpenBSD: frame.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: frame.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/arch/mips64/include/ieeefp.h b/sys/arch/mips64/include/ieeefp.h index 5828b51e39e..b833c549bd3 100644 --- a/sys/arch/mips64/include/ieeefp.h +++ b/sys/arch/mips64/include/ieeefp.h @@ -1,6 +1,6 @@ -/* $OpenBSD: ieeefp.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ -/* +/* * Written by J.T. Conklin, Apr 11, 1995 * Public domain. */ diff --git a/sys/arch/mips64/include/link.h b/sys/arch/mips64/include/link.h index 6526a506204..99d6ef0bdf5 100644 --- a/sys/arch/mips64/include/link.h +++ b/sys/arch/mips64/include/link.h @@ -1,8 +1,8 @@ -/* $OpenBSD: link.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: link.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,7 +34,7 @@ #ifndef _MIPS_LINK_H_ #define _MIPS_LINK_H_ - + #include <elf_abi.h> #include <machine/elf_abi.h> @@ -46,9 +46,9 @@ struct r_debug { int r_version; /* Protocol version. */ - struct link_map *r_map; /* Head of list of loaded objects. */ + struct link_map *r_map; /* Head of list of loaded objects. */ - Elf32_Addr r_brk; + Elf32_Addr r_brk; enum { RT_CONSISTENT, /* Mapping change is complete. */ RT_ADD, /* Adding a new object. */ @@ -56,8 +56,7 @@ struct r_debug { } r_state; Elf32_Addr r_ldbase; /* Base address the linker is loaded at. */ -}; - +}; /* * Shared object map data used by the debugger. diff --git a/sys/arch/mips64/include/param.h b/sys/arch/mips64/include/param.h index ead77486827..303fc110592 100644 --- a/sys/arch/mips64/include/param.h +++ b/sys/arch/mips64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.2 2004/08/06 22:31:31 mickey Exp $ */ +/* $OpenBSD: param.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -44,13 +44,13 @@ #ifndef _MIPS_PARAM_H_ #define _MIPS_PARAM_H_ -#ifdef _KERNEL +#ifdef _KERNEL #ifdef _LOCORE -#include <machine/psl.h> -#else +#include <machine/psl.h> +#else #include <machine/cpu.h> -#endif -#endif +#endif +#endif /* * Round p (pointer or byte index) up to a correctly-aligned value for all diff --git a/sys/arch/mips64/include/pio.h b/sys/arch/mips64/include/pio.h index e8253b69c63..2f3677bf1fa 100644 --- a/sys/arch/mips64/include/pio.h +++ b/sys/arch/mips64/include/pio.h @@ -1,8 +1,8 @@ -/* $OpenBSD: pio.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: pio.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -82,7 +82,7 @@ __out16rb(a,v) _v_ = ((v >> 8) & 0xff) | (v << 8); out16(a, _v_); -} +} static __inline u_int32_t __in32rb(a) @@ -93,7 +93,7 @@ __in32rb(a) _v_ = in32(a); _v_ = _swap_(_v_); return _v_; -} +} static __inline u_int16_t __in16rb(a) diff --git a/sys/arch/mips64/include/pmap.h b/sys/arch/mips64/include/pmap.h index 1b7d8984070..f1ba4bf8e1c 100644 --- a/sys/arch/mips64/include/pmap.h +++ b/sys/arch/mips64/include/pmap.h @@ -1,6 +1,6 @@ -/* $OpenBSD: pmap.h,v 1.2 2004/08/06 22:39:13 deraadt Exp $ */ +/* $OpenBSD: pmap.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ -/* +/* * Copyright (c) 1987 Carnegie-Mellon University * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -53,7 +53,7 @@ * The user address space is mapped using a two level structure where * virtual address bits 30..22 are used to index into a segment table which * points to a page worth of PTEs (4096 page can hold 1024 PTEs). - * Bits 21..12 are then used to index a PTE which describes a page within + * Bits 21..12 are then used to index a PTE which describes a page within * a segment. * * The wired entries in the TLB will contain the following: diff --git a/sys/arch/mips64/include/regnum.h b/sys/arch/mips64/include/regnum.h index 0de6f8e9f7f..bfe12804725 100644 --- a/sys/arch/mips64/include/regnum.h +++ b/sys/arch/mips64/include/regnum.h @@ -1,8 +1,8 @@ -/* $OpenBSD: regnum.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: regnum.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/arch/mips64/include/signal.h b/sys/arch/mips64/include/signal.h index 6af5d134bb6..e162ccf1aae 100644 --- a/sys/arch/mips64/include/signal.h +++ b/sys/arch/mips64/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: signal.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -68,7 +68,7 @@ struct sigcontext { f_register_t sc_fpregs[33]; /* fp regs 0 to 31 and csr */ long sc_fpused; /* fp has been used */ long sc_fpc_eir; /* floating point exception instruction reg */ - long xxx[8]; /* XXX reserved */ + long xxx[8]; /* XXX reserved */ }; #endif /* !_ANSI_SOURCE */ diff --git a/sys/arch/mips64/include/trap.h b/sys/arch/mips64/include/trap.h index 0f2459456f7..65b02955390 100644 --- a/sys/arch/mips64/include/trap.h +++ b/sys/arch/mips64/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.2 2004/08/08 14:21:27 pefo Exp $ */ +/* $OpenBSD: trap.h,v 1.3 2004/08/10 20:28:13 deraadt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -111,7 +111,7 @@ struct trapdebug { /* trap history buffer for debugging */ } #define TRAPSIZE 10 /* Trap log buffer length */ -extern struct trapdebug trapdebug[TRAPSIZE], *trp; +extern struct trapdebug trapdebug[TRAPSIZE], *trp; void trapDump __P((char *msg)); diff --git a/sys/arch/mips64/include/vmparam.h b/sys/arch/mips64/include/vmparam.h index 581716a9c50..05dba28e58e 100644 --- a/sys/arch/mips64/include/vmparam.h +++ b/sys/arch/mips64/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: vmparam.h,v 1.2 2004/08/10 20:28:13 deraadt Exp $ */ /* $NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $ */ /* @@ -99,7 +99,7 @@ * It is related to human patience and other factors which don't really * change over time. */ -#define MAXSLP 20 +#define MAXSLP 20 #define VM_PHYSSEG_MAX 8 /* Max number of physical memory segments */ #define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH @@ -137,6 +137,6 @@ vaddr_t virtual_end; struct pmap_physseg { struct pv_entry *pvent; /* pv list of this seg */ char *attrs; -}; +}; #endif /* !_MIPS_VMPARAM_H_ */ |