diff options
Diffstat (limited to 'sys/arch/powerpc/include')
| -rw-r--r-- | sys/arch/powerpc/include/ansi.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/asm.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/cpu.h | 8 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/elf_abi.h | 6 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/exec.h | 6 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/ieeefp.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/intr.h | 18 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/ipkdb.h | 8 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/limits.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/pio.h | 13 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/pmap.h | 18 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/profile.h | 7 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/reg.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/types.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/va-ppc.h | 3 |
15 files changed, 56 insertions, 55 deletions
diff --git a/sys/arch/powerpc/include/ansi.h b/sys/arch/powerpc/include/ansi.h index 9de2ec7061e..83582fa90a7 100644 --- a/sys/arch/powerpc/include/ansi.h +++ b/sys/arch/powerpc/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.8 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: ansi.h,v 1.9 2002/09/15 09:01:59 deraadt Exp $ */ /* $NetBSD: ansi.h,v 1.2 1996/11/15 22:38:57 jtc Exp $ */ /*- @@ -67,7 +67,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/powerpc/include/asm.h b/sys/arch/powerpc/include/asm.h index c9df19221fe..4a996b18638 100644 --- a/sys/arch/powerpc/include/asm.h +++ b/sys/arch/powerpc/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.6 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: asm.h,v 1.7 2002/09/15 09:01:59 deraadt Exp $ */ /* $NetBSD: asm.h,v 1.1 1996/09/30 16:34:20 ws Exp $ */ /* @@ -91,7 +91,7 @@ _TMP_LABEL(y):; \ addis 11, 11, _TMP_LABEL(y)@ha; \ stw 0, 4(1); \ addi 0, 11,_TMP_LABEL(y)@l; \ - bl _mcount; + bl _mcount; #else # define _PROF_PROLOGUE(y) #endif diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h index be0714ff88f..d615387b78c 100644 --- a/sys/arch/powerpc/include/cpu.h +++ b/sys/arch/powerpc/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.12 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: cpu.h,v 1.13 2002/09/15 09:01:59 deraadt Exp $ */ /* $NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $ */ /* @@ -69,7 +69,7 @@ syncicache(void *from, int len) len = len + (((u_int32_t) from) & (CACHELINESIZE - 1)); l = len; - + do { __asm__ __volatile__ ("dcbst 0,%0" :: "r"(p)); p += CACHELINESIZE; @@ -89,10 +89,10 @@ invdcache(void *from, int len) { int l; char *p = from; - + len = len + (((u_int32_t) from) & (CACHELINESIZE - 1)); l = len; - + do { __asm__ __volatile__ ("dcbi 0,%0" :: "r"(p)); p += CACHELINESIZE; diff --git a/sys/arch/powerpc/include/elf_abi.h b/sys/arch/powerpc/include/elf_abi.h index d55a7962915..69246bbbff9 100644 --- a/sys/arch/powerpc/include/elf_abi.h +++ b/sys/arch/powerpc/include/elf_abi.h @@ -1,8 +1,8 @@ -/* $OpenBSD: elf_abi.h,v 1.2 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: elf_abi.h,v 1.3 2002/09/15 09:01:59 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: @@ -37,7 +37,7 @@ /* From MIPS ABI supplemental */ -/* Architecture dependent Segment types - p_type */ +/* Architecture dependent Segment types - p_type */ /* ??NONE?? */ /* Architecture dependent d_tag field for Elf32_Dyn. */ diff --git a/sys/arch/powerpc/include/exec.h b/sys/arch/powerpc/include/exec.h index e075d671a99..893605087ef 100644 --- a/sys/arch/powerpc/include/exec.h +++ b/sys/arch/powerpc/include/exec.h @@ -1,8 +1,8 @@ -/* $OpenBSD: exec.h,v 1.8 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: exec.h,v 1.9 2002/09/15 09:01:59 deraadt Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exec.h,v 1.8 2002/09/15 02:02:44 deraadt Exp $ + * $Id: exec.h,v 1.9 2002/09/15 09:01:59 deraadt Exp $ */ #ifndef _POWERPC_EXEC_H_ diff --git a/sys/arch/powerpc/include/ieeefp.h b/sys/arch/powerpc/include/ieeefp.h index 0fd21b947b2..8bd392245f1 100644 --- a/sys/arch/powerpc/include/ieeefp.h +++ b/sys/arch/powerpc/include/ieeefp.h @@ -1,5 +1,5 @@ -/* $OpenBSD: ieeefp.h,v 1.5 2002/09/15 02:02:44 deraadt Exp $ */ -/* +/* $OpenBSD: ieeefp.h,v 1.6 2002/09/15 09:01:59 deraadt Exp $ */ +/* * Written by J.T. Conklin, Apr 6, 1995 * Public domain. */ diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h index 92f6124a334..3367f3b3798 100644 --- a/sys/arch/powerpc/include/intr.h +++ b/sys/arch/powerpc/include/intr.h @@ -1,8 +1,8 @@ -/* $OpenBSD: intr.h,v 1.20 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: intr.h,v 1.21 2002/09/15 09:01:59 deraadt Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -93,7 +93,7 @@ splx(int newcpl) { __asm__ volatile("":::"memory"); /* reorder protect */ cpl = newcpl; - if (ipending & ~newcpl) + if(ipending & ~newcpl) do_pending_int(); __asm__ volatile("":::"memory"); /* reorder protect */ } @@ -106,7 +106,7 @@ spllower(int newcpl) __asm__ volatile("":::"memory"); /* reorder protect */ oldcpl = cpl; cpl = newcpl; - if (ipending & ~newcpl) + if(ipending & ~newcpl) do_pending_int(); __asm__ volatile("":::"memory"); /* reorder protect */ return(oldcpl); @@ -158,11 +158,11 @@ set_sint(int pending) struct intrhand { struct intrhand *ih_next; int (*ih_fun)(void *); - void *ih_arg; - u_long ih_count; - int ih_level; - int ih_irq; - char *ih_what; + void *ih_arg; + u_long ih_count; + int ih_level; + int ih_irq; + char *ih_what; }; extern int ppc_configed_intr_cnt; #define MAX_PRECONF_INTR 16 diff --git a/sys/arch/powerpc/include/ipkdb.h b/sys/arch/powerpc/include/ipkdb.h index 5ae6fb90709..9eb484cf7b7 100644 --- a/sys/arch/powerpc/include/ipkdb.h +++ b/sys/arch/powerpc/include/ipkdb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ipkdb.h,v 1.5 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: ipkdb.h,v 1.6 2002/09/15 09:01:59 deraadt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -50,7 +50,7 @@ ipkdbcopy(s,d,n) int n; { char *sp = s, *dp = d; - + while (--n >= 0) *dp++ = *sp++; } @@ -61,7 +61,7 @@ ipkdbzero(d,n) int n; { char *dp = d; - + while (--n >= 0) *dp++ = 0; } @@ -71,7 +71,7 @@ ipkdbcmp(s,d,n) void *s, *d; { char *sp = s, *dp = d; - + while (--n >= 0) if (*sp++ != *dp++) return *--dp - *--sp; diff --git a/sys/arch/powerpc/include/limits.h b/sys/arch/powerpc/include/limits.h index be51e94f159..0ad3045e87f 100644 --- a/sys/arch/powerpc/include/limits.h +++ b/sys/arch/powerpc/include/limits.h @@ -1,4 +1,4 @@ -/* $OpenBSD: limits.h,v 1.12 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: limits.h,v 1.13 2002/09/15 09:01:59 deraadt Exp $ */ /* $NetBSD: limits.h,v 1.1 1996/09/30 16:34:28 ws Exp $ */ /*- @@ -39,7 +39,7 @@ #if !defined(_ANSI_SOURCE) #define SIZE_MAX UINT_MAX /* max value for a size_t */ -#define SSIZE_MAX INT_MAX /* max value for a ssize_t */ +#define SSIZE_MAX INT_MAX /* max value for a ssize_t */ #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) #define SIZE_T_MAX UINT_MAX /* max value for a size_t */ diff --git a/sys/arch/powerpc/include/pio.h b/sys/arch/powerpc/include/pio.h index c0cad78481a..c70360e6006 100644 --- a/sys/arch/powerpc/include/pio.h +++ b/sys/arch/powerpc/include/pio.h @@ -1,8 +1,8 @@ -/* $OpenBSD: pio.h,v 1.8 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: pio.h,v 1.9 2002/09/15 09:01:59 deraadt Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -163,16 +163,15 @@ __flash_led(bits, count) { int i, v = 0; - if (bits == 0) { - v = 1; - bits = 3; + if(bits == 0) { + v = 1; bits = 3; } bits &= 3; count += count; v |= (*(volatile u_int8_t *)(MPC106_V_ISA_IO_SPACE + 0x01f4)) & ~3; - while (count--) { + while(count--) { v ^= bits; - for (i = 100000; i > 0; i--) + for(i = 100000; i > 0; i--) *(volatile u_int8_t *)(MPC106_V_ISA_IO_SPACE + 0x01f4) = v; } *(u_int8_t *)(MPC106_V_ISA_IO_SPACE + 0x01f4) &= ~3; diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h index 74f15684fe5..d61d9e2c378 100644 --- a/sys/arch/powerpc/include/pmap.h +++ b/sys/arch/powerpc/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.30 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: pmap.h,v 1.31 2002/09/15 09:01:59 deraadt Exp $ */ /* $NetBSD: pmap.h,v 1.1 1996/09/30 16:34:29 ws Exp $ */ /*- @@ -49,7 +49,7 @@ typedef u_int sr_t; #define SR_NOEXEC 0x10000000 #define SR_VSID 0x00ffffff /* - * bit + * bit * 3 2 2 2 2 1 1 1 1 1 0 * 1 8 7 4 0 9 6 5 2 1 0 * |XXXX|XXXX XXXX|XXXX XXXX|XXXX XXXX XXXX @@ -63,20 +63,20 @@ typedef u_int sr_t; /* V->P mapping data */ #define VP_SR_SIZE 16 #define VP_SR_MASK (VP_SR_SIZE-1) -#define VP_SR_POS 28 +#define VP_SR_POS 28 #define VP_IDX1_SIZE 256 #define VP_IDX1_MASK (VP_IDX1_SIZE-1) -#define VP_IDX1_POS 20 +#define VP_IDX1_POS 20 #define VP_IDX2_SIZE 256 #define VP_IDX2_MASK (VP_IDX2_SIZE-1) -#define VP_IDX2_POS 12 +#define VP_IDX2_POS 12 void pmap_kenter_cache( vaddr_t va, paddr_t pa, vm_prot_t prot, int cacheable); /* cache flags */ -#define PMAP_CACHE_DEFAULT 0 /* WB cache managed mem, devices not */ -#define PMAP_CACHE_CI 1 /* cache inhibit */ -#define PMAP_CACHE_WT 2 /* writethru */ +#define PMAP_CACHE_DEFAULT 0 /* WB cache managed mem, devices not */ +#define PMAP_CACHE_CI 1 /* cache inhibit */ +#define PMAP_CACHE_WT 2 /* writethru */ #define PMAP_CACHE_WB 3 /* writeback */ /* @@ -110,7 +110,7 @@ boolean_t pteclrbits(paddr_t pa, u_int mask, u_int clear); #define pmap_phys_address(x) (x) #define pmap_update(pmap) /* nothing (yet) */ -#define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count) +#define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count) /* * Alternate mapping methods for pool. diff --git a/sys/arch/powerpc/include/profile.h b/sys/arch/powerpc/include/profile.h index 6a1d86323d4..ea974344f06 100644 --- a/sys/arch/powerpc/include/profile.h +++ b/sys/arch/powerpc/include/profile.h @@ -1,8 +1,9 @@ -/* $OpenBSD: profile.h,v 1.3 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: profile.h,v 1.4 2002/09/15 09:01:59 deraadt Exp $ */ /* * Copyright (c) 1998 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: @@ -27,7 +28,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. - */ + */ #define MCOUNT \ __asm__(" \ .section \".text\" \n\ @@ -49,7 +50,7 @@ stw 10,36(1) \n\ stw 11,40(1) \n\ mr 4, 0 \n\ - mr 3, 11 \n\ + mr 3, 11 \n\ bl __mcount \n\ lwz 3, 8(1) \n\ lwz 4, 12(1) \n\ diff --git a/sys/arch/powerpc/include/reg.h b/sys/arch/powerpc/include/reg.h index 9087382d038..2a7003222b8 100644 --- a/sys/arch/powerpc/include/reg.h +++ b/sys/arch/powerpc/include/reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: reg.h,v 1.7 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: reg.h,v 1.8 2002/09/15 09:01:59 deraadt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -61,7 +61,7 @@ struct reg { }; struct vreg { - u_int32_t vreg[32][4]; + u_int32_t vreg[32][4]; u_int64_t vscr; u_int32_t vrsave; u_int32_t pad; diff --git a/sys/arch/powerpc/include/types.h b/sys/arch/powerpc/include/types.h index bfbbd8b1616..73f270b6aa2 100644 --- a/sys/arch/powerpc/include/types.h +++ b/sys/arch/powerpc/include/types.h @@ -1,5 +1,5 @@ /* $NetBSD: types.h,v 1.1 1996/09/30 16:34:36 ws Exp $ */ -/* $OpenBSD: types.h,v 1.11 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: types.h,v 1.12 2002/09/15 09:01:59 deraadt Exp $ */ /*- * Copyright (C) 1995 Wolfgang Solfrank. @@ -62,7 +62,7 @@ typedef unsigned long vsize_t; typedef unsigned long psize_t; typedef struct label_t { - int val[40]; /* double check this XXX */ + int val[40]; /* double check this XXX */ } label_t; #define __BROKEN_INDIRECT_CONFIG diff --git a/sys/arch/powerpc/include/va-ppc.h b/sys/arch/powerpc/include/va-ppc.h index 255716665e1..b8359bead00 100644 --- a/sys/arch/powerpc/include/va-ppc.h +++ b/sys/arch/powerpc/include/va-ppc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: va-ppc.h,v 1.7 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: va-ppc.h,v 1.8 2002/09/15 09:01:59 deraadt Exp $ */ /* GNU C varargs support for the PowerPC with either the V.4 or Windows NT calling sequences */ #ifndef _WIN32 @@ -249,6 +249,7 @@ __extension__ ({ \ (struct __va_list_tag *)__builtin_alloca(sizeof(__gnuc_va_list)); \ *(dest) = *(src);\ }) + #endif /* __VA_PPC_H__ */ |