diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/alpha/include/types.h | 7 | ||||
| -rw-r--r-- | sys/arch/arm32/include/types.h | 7 | ||||
| -rw-r--r-- | sys/arch/i386/include/types.h | 9 | ||||
| -rw-r--r-- | sys/arch/m68k/include/types.h | 7 | ||||
| -rw-r--r-- | sys/arch/mips/include/types.h | 7 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/types.h | 7 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/types.h | 7 | ||||
| -rw-r--r-- | sys/arch/sparc/include/types.h | 9 |
8 files changed, 43 insertions, 17 deletions
diff --git a/sys/arch/alpha/include/types.h b/sys/arch/alpha/include/types.h index 6f95dce7119..c1bf5ad7fe9 100644 --- a/sys/arch/alpha/include/types.h +++ b/sys/arch/alpha/include/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.6 1999/01/08 03:04:07 millert Exp $ */ +/* $OpenBSD: types.h,v 1.7 1999/07/07 23:16:40 art Exp $ */ /* $NetBSD: types.h,v 1.6 1996/12/05 00:13:47 cgd Exp $ */ /*- @@ -54,6 +54,11 @@ typedef struct label_t { typedef unsigned long vm_offset_t; typedef unsigned long vm_size_t; +typedef unsigned long vaddr_t; +typedef unsigned long paddr_t; +typedef unsigned long vsize_t; +typedef unsigned long psize_t; + /* * Basic integral types. Omit the typedef if * not possible for a machine/compiler combination. diff --git a/sys/arch/arm32/include/types.h b/sys/arch/arm32/include/types.h index c3fef86182f..7c1d92e41f5 100644 --- a/sys/arch/arm32/include/types.h +++ b/sys/arch/arm32/include/types.h @@ -1,5 +1,5 @@ /* $NetBSD: types.h,v 1.2 1996/03/06 23:04:04 mark Exp $ */ -/* $OpenBSD: types.h,v 1.3 1999/01/08 03:04:07 millert Exp $ */ +/* $OpenBSD: types.h,v 1.4 1999/07/07 23:16:40 art Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -52,6 +52,11 @@ typedef struct label_t { /* Used by setjmp & longjmp */ typedef unsigned long vm_offset_t; typedef unsigned long vm_size_t; +typedef unsigned long vaddr_t; +typedef unsigned long paddr_t; +typedef unsigned long vsize_t; +typedef unsigned long psize_t; + /* * Basic integral types. Omit the typedef if * not possible for a machine/compiler combination. diff --git a/sys/arch/i386/include/types.h b/sys/arch/i386/include/types.h index c8391f16d8b..9a2548558f8 100644 --- a/sys/arch/i386/include/types.h +++ b/sys/arch/i386/include/types.h @@ -1,5 +1,5 @@ /* $NetBSD: types.h,v 1.12 1995/12/24 01:08:03 mycroft Exp $ */ -/* $OpenBSD: types.h,v 1.6 1999/02/26 04:19:25 art Exp $ */ +/* $OpenBSD: types.h,v 1.7 1999/07/07 23:16:40 art Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -54,13 +54,10 @@ typedef struct label_t { typedef unsigned long vm_offset_t; typedef unsigned long vm_size_t; -#ifdef UVM -/* UVM compat (or we should consider switching to those) */ -typedef unsigned long paddr_t; -typedef unsigned long psize_t; typedef unsigned long vaddr_t; +typedef unsigned long paddr_t; typedef unsigned long vsize_t; -#endif +typedef unsigned long psize_t; /* * Basic integral types. Omit the typedef if diff --git a/sys/arch/m68k/include/types.h b/sys/arch/m68k/include/types.h index 8f5cbd2749e..7b1068c3637 100644 --- a/sys/arch/m68k/include/types.h +++ b/sys/arch/m68k/include/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.7 1999/01/08 03:04:08 millert Exp $ */ +/* $OpenBSD: types.h,v 1.8 1999/07/07 23:16:41 art Exp $ */ /* $NetBSD: types.h,v 1.9 1995/07/06 03:39:38 cgd Exp $ */ /*- @@ -53,6 +53,11 @@ typedef struct label_t { /* consistent with HP-UX */ typedef unsigned long vm_offset_t; typedef unsigned long vm_size_t; +typedef unsigned long vaddr_t; +typedef unsigned long paddr_t; +typedef unsigned long vsize_t; +typedef unsigned long psize_t; + /* * Basic integral types. Omit the typedef if * not possible for a machine/compiler combination. diff --git a/sys/arch/mips/include/types.h b/sys/arch/mips/include/types.h index 2165a448941..cd29b7572fc 100644 --- a/sys/arch/mips/include/types.h +++ b/sys/arch/mips/include/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.6 1999/01/27 04:46:06 imp Exp $ */ +/* $OpenBSD: types.h,v 1.7 1999/07/07 23:16:41 art Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -56,6 +56,11 @@ typedef struct label_t { typedef unsigned long vm_offset_t; typedef unsigned long vm_size_t; +typedef unsigned long vaddr_t; +typedef unsigned long paddr_t; +typedef unsigned long vsize_t; +typedef unsigned long psize_t; + /* * Basic integral types. Omit the typedef if * not possible for a machine/compiler combination. diff --git a/sys/arch/mvme88k/include/types.h b/sys/arch/mvme88k/include/types.h index b2d072c6c45..aa4943c6498 100644 --- a/sys/arch/mvme88k/include/types.h +++ b/sys/arch/mvme88k/include/types.h @@ -1,5 +1,5 @@ /* $NetBSD: types.h,v 1.7 1995/07/05 17:46:11 pk Exp $ */ -/* $OpenBSD: types.h,v 1.6 1999/01/08 03:04:08 millert Exp $ */ +/* $OpenBSD: types.h,v 1.7 1999/07/07 23:16:41 art Exp $ */ /* * Copyright (c) 1992, 1993 @@ -63,6 +63,11 @@ typedef struct label_t { typedef unsigned long vm_offset_t; typedef unsigned long vm_size_t; +typedef unsigned long vaddr_t; +typedef unsigned long paddr_t; +typedef unsigned long vsize_t; +typedef unsigned long psize_t; + /* * Basic integral types. Omit the typedef if * not possible for a machine/compiler combination. diff --git a/sys/arch/powerpc/include/types.h b/sys/arch/powerpc/include/types.h index 42e4b3f55f1..523f06c7788 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.7 1999/01/08 03:04:08 millert Exp $ */ +/* $OpenBSD: types.h,v 1.8 1999/07/07 23:16:41 art Exp $ */ /*- * Copyright (C) 1995 Wolfgang Solfrank. @@ -56,6 +56,11 @@ typedef u_int32_t register_t; typedef unsigned long vm_size_t; typedef unsigned long vm_offset_t; +typedef unsigned long vaddr_t; +typedef unsigned long paddr_t; +typedef unsigned long vsize_t; +typedef unsigned long psize_t; + typedef struct label_t { int val[40]; /* double check this XXX */ } label_t; diff --git a/sys/arch/sparc/include/types.h b/sys/arch/sparc/include/types.h index c3d6bd0bf25..b26c8e05e41 100644 --- a/sys/arch/sparc/include/types.h +++ b/sys/arch/sparc/include/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.8 1999/04/22 17:39:47 art Exp $ */ +/* $OpenBSD: types.h,v 1.9 1999/07/07 23:16:41 art Exp $ */ /* $NetBSD: types.h,v 1.11 1996/12/10 23:19:38 pk Exp $ */ /* @@ -60,14 +60,13 @@ typedef struct label_t { } label_t; #endif -#if defined(UVM) /* XXX - clean up later */ +typedef unsigned long vm_offset_t; +typedef unsigned long vm_size_t; + typedef unsigned long vaddr_t; typedef unsigned long paddr_t; typedef unsigned long vsize_t; typedef unsigned long psize_t; -#endif -typedef unsigned long vm_offset_t; -typedef unsigned long vm_size_t; /* * Basic integral types. Omit the typedef if |