diff options
| -rw-r--r-- | sys/alpha/include/types.h | 17 | ||||
| -rw-r--r-- | sys/i386/include/types.h | 14 | ||||
| -rw-r--r-- | sys/ia64/include/types.h | 19 | ||||
| -rw-r--r-- | sys/powerpc/include/types.h | 27 | ||||
| -rw-r--r-- | sys/sparc64/include/types.h | 17 |
5 files changed, 50 insertions, 44 deletions
diff --git a/sys/alpha/include/types.h b/sys/alpha/include/types.h index 2a4c325..9df972e 100644 --- a/sys/alpha/include/types.h +++ b/sys/alpha/include/types.h @@ -1,6 +1,3 @@ -/* $FreeBSD$ */ -/* From: NetBSD: types.h,v 1.8 1997/04/06 08:47:45 cgd Exp */ - /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -34,6 +31,8 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 + * $NetBSD: types.h,v 1.8 1997/04/06 08:47:45 cgd Exp $ + * $FreeBSD$ */ #ifndef _MACHTYPES_H_ @@ -42,11 +41,11 @@ #include <sys/cdefs.h> #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -typedef struct _physadr { +typedef struct _physadr { long r[1]; } *physadr; -typedef struct label_t { +typedef struct label_t { long val[10]; } label_t; #endif @@ -56,8 +55,8 @@ typedef long vm_ooffset_t; typedef unsigned long vm_pindex_t; typedef unsigned long vm_size_t; -typedef __int64_t register_t; -typedef __uint64_t u_register_t; +typedef __int64_t register_t; +typedef __uint64_t u_register_t; #ifdef _KERNEL typedef long intfptr_t; @@ -65,9 +64,9 @@ typedef unsigned long uintfptr_t; #endif /* Critical section value */ -typedef register_t critical_t; +typedef register_t critical_t; /* Interrupt mask (spl, xxx_imask, etc) */ -typedef __uint32_t intrmask_t; +typedef __uint32_t intrmask_t; #endif /* _MACHTYPES_H_ */ diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h index 66e95ec..4b11496 100644 --- a/sys/i386/include/types.h +++ b/sys/i386/include/types.h @@ -38,12 +38,12 @@ #define _MACHINE_TYPES_H_ #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -typedef struct _physadr { - int r[1]; +typedef struct _physadr { + int r[1]; } *physadr; -typedef struct label_t { - int val[6]; +typedef struct label_t { + int val[6]; } label_t; #endif @@ -61,12 +61,12 @@ typedef unsigned int uintfptr_t; #endif /* Critical section value */ -typedef register_t critical_t; +typedef register_t critical_t; /* Interrupt mask (spl, xxx_imask, etc) */ -typedef __uint32_t intrmask_t; +typedef __uint32_t intrmask_t; /* Interrupt handler function type. */ -typedef void ointhand2_t __P((int _device_id)); +typedef void ointhand2_t __P((int _device_id)); #endif /* !_MACHINE_TYPES_H_ */ diff --git a/sys/ia64/include/types.h b/sys/ia64/include/types.h index 86ece49..61c34cf 100644 --- a/sys/ia64/include/types.h +++ b/sys/ia64/include/types.h @@ -1,6 +1,3 @@ -/* $FreeBSD$ */ -/* From: NetBSD: types.h,v 1.8 1997/04/06 08:47:45 cgd Exp */ - /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -34,6 +31,8 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 + * $NetBSD: types.h,v 1.8 1997/04/06 08:47:45 cgd Exp $ + * $FreeBSD$ */ #ifndef _MACHTYPES_H_ @@ -42,11 +41,11 @@ #include <sys/cdefs.h> #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -typedef struct _physadr { +typedef struct _physadr { long r[1]; } *physadr; -typedef struct label_t { +typedef struct label_t { long val[10]; } label_t; #endif @@ -56,8 +55,8 @@ typedef long vm_ooffset_t; typedef unsigned long vm_pindex_t; typedef unsigned long vm_size_t; -typedef __int64_t register_t; -typedef __uint64_t u_register_t; +typedef __int64_t register_t; +typedef __uint64_t u_register_t; #ifdef _KERNEL typedef long intfptr_t; @@ -65,12 +64,12 @@ typedef unsigned long uintfptr_t; #endif /* Critical section value */ -typedef register_t critical_t; +typedef register_t critical_t; /* Interrupt mask (spl, xxx_imask, etc) */ -typedef __uint64_t intrmask_t; +typedef __uint64_t intrmask_t; /* Interrupt handler function type */ -typedef void inthand2_t(void *); +typedef void inthand2_t(void *); #endif /* _MACHTYPES_H_ */ diff --git a/sys/powerpc/include/types.h b/sys/powerpc/include/types.h index 8d6b107..7d4522e 100644 --- a/sys/powerpc/include/types.h +++ b/sys/powerpc/include/types.h @@ -40,31 +40,32 @@ #include <sys/cdefs.h> #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -typedef struct _physadr { +typedef struct _physadr { long r[1]; } *physadr; -typedef struct label_t { +typedef struct label_t { long val[10]; } label_t; #endif -typedef unsigned int vm_offset_t; -typedef __int64_t vm_ooffset_t; -typedef unsigned int vm_pindex_t; -typedef unsigned int vm_size_t; +typedef unsigned int vm_offset_t; +typedef __int64_t vm_ooffset_t; +typedef unsigned int vm_pindex_t; +typedef unsigned int vm_size_t; -typedef __int32_t register_t; -typedef __uint32_t u_register_t; +typedef __int32_t register_t; +typedef __uint32_t u_register_t; #ifdef _KERNEL -typedef int intfptr_t; -typedef unsigned int uintfptr_t; +typedef int intfptr_t; +typedef unsigned int uintfptr_t; #endif -/* Interrupt mask (spl, xxx_imask, etc) */ -typedef __uint32_t intrmask_t; +/* Critical section value */ +typedef register_t critical_t; -typedef register_t critical_t; +/* Interrupt mask (spl, xxx_imask, etc) */ +typedef __uint32_t intrmask_t; #endif /* _MACHTYPES_H_ */ diff --git a/sys/sparc64/include/types.h b/sys/sparc64/include/types.h index 0726618..850a9f6 100644 --- a/sys/sparc64/include/types.h +++ b/sys/sparc64/include/types.h @@ -10,6 +10,13 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -33,7 +40,7 @@ #include <sys/cdefs.h> #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -typedef struct _physadr { +typedef struct _physadr { long r[1]; } *physadr; @@ -47,8 +54,8 @@ typedef long vm_ooffset_t; typedef unsigned long vm_pindex_t; typedef unsigned long vm_size_t; -typedef __int64_t register_t; -typedef __uint64_t u_register_t; +typedef __int64_t register_t; +typedef __uint64_t u_register_t; #ifdef _KERNEL typedef long intfptr_t; @@ -56,9 +63,9 @@ typedef unsigned long uintfptr_t; #endif /* Critical section value */ -typedef register_t critical_t; +typedef register_t critical_t; /* Interrupt mask (spl, xxx_imask, etc) */ -typedef __uint32_t intrmask_t; +typedef __uint32_t intrmask_t; #endif /* !_MACHINE_TYPES_H_ */ |
