[src/trunk]: src/sys/arch/arm26/include Now that arm26 does __HAVE_MINIMAL_EM...

[bjh21 <bjh21%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d114a891315
branches:  trunk
changeset: 504255:9d114a891315
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Mon Feb 26 00:19:57 2001 +0000

description:
Now that arm26 does __HAVE_MINIMAL_EMUL, switch it over to using
<arm/types.h>.

diffstat:

 sys/arch/arm26/include/types.h |  90 ++---------------------------------------
 1 files changed, 5 insertions(+), 85 deletions(-)

diffs (99 lines):

diff -r c9ccb7813938 -r 9d114a891315 sys/arch/arm26/include/types.h
--- a/sys/arch/arm26/include/types.h    Mon Feb 26 00:14:59 2001 +0000
+++ b/sys/arch/arm26/include/types.h    Mon Feb 26 00:19:57 2001 +0000
@@ -1,90 +1,10 @@
-/* $NetBSD: types.h,v 1.6 2001/02/25 23:08:33 bjh21 Exp $ */
+/* $NetBSD: types.h,v 1.7 2001/02/26 00:19:57 bjh21 Exp $ */
 
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY 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.
- *
- *     from: @(#)types.h       7.5 (Berkeley) 3/9/91
- */
+#ifndef        _ARM26_TYPES_H_
+#define        _ARM26_TYPES_H_
 
-#ifndef        _ARM32_TYPES_H_
-#define        _ARM32_TYPES_H_
-
-#include <sys/cdefs.h>
-#include <machine/int_types.h>
+#include <arm/types.h>
 
 #define        __HAVE_GENERIC_SOFT_INTERRUPTS
-#define __HAVE_MINIMAL_EMUL
 
-/* NB: This should probably be if defined(_KERNEL) */
-#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
-typedef        unsigned long   vm_offset_t;
-typedef        unsigned long   vm_size_t;
-
-typedef vm_offset_t    paddr_t;
-typedef vm_size_t      psize_t;
-typedef vm_offset_t    vaddr_t;
-typedef vm_size_t      vsize_t;
-#endif
-
-/*
- * Basic integral types.  Omit the typedef if
- * not possible for a machine/compiler combination.
- */
-#define        __BIT_TYPES_DEFINED__
-typedef        __int8_t           int8_t;
-typedef        __uint8_t        u_int8_t;
-typedef        __int16_t         int16_t;
-typedef        __uint16_t      u_int16_t;
-typedef        __int32_t         int32_t;
-typedef        __uint32_t      u_int32_t;
-typedef        __int64_t         int64_t;
-typedef        __uint64_t      u_int64_t;
-
-typedef int32_t                 register_t;
-
-#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
-/* This structure must be kept synchronised with setjmp.S */
-typedef struct label_t {       /* Used by setjmp & longjmp */
-       register_t      jb_r4;
-       register_t      jb_r5;
-       register_t      jb_r6;
-       register_t      jb_r7;
-       register_t      jb_r8;
-       register_t      jb_r9;
-       register_t      jb_r10;
-       register_t      jb_r11;
-       register_t      jb_r13;
-       register_t      jb_r14;
-} label_t;
-#endif
-
-#endif /* _ARM32_TYPES_H_ */
+#endif /* _ARM26_TYPES_H_ */