Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386/include Redirect some includes to x86/foo.h
details: https://anonhg.NetBSD.org/src/rev/9fcacddc2208
branches: trunk
changeset: 543508:9fcacddc2208
user: fvdl <fvdl%NetBSD.org@localhost>
date: Wed Feb 26 21:28:59 2003 +0000
description:
Redirect some includes to x86/foo.h
diffstat:
sys/arch/i386/include/aout_machdep.h | 50 +-
sys/arch/i386/include/apicvar.h | 58 +-
sys/arch/i386/include/asm.h | 4 +-
sys/arch/i386/include/atomic.h | 10 +-
sys/arch/i386/include/bios32.h | 85 +--
sys/arch/i386/include/bootinfo.h | 153 +----
sys/arch/i386/include/bus.h | 1199 +---------------------------------
sys/arch/i386/include/cpu.h | 18 +-
sys/arch/i386/include/cpuvar.h | 8 +-
sys/arch/i386/include/eisa_machdep.h | 4 +-
sys/arch/i386/include/float.h | 81 +--
sys/arch/i386/include/i82093reg.h | 122 +---
sys/arch/i386/include/i82093var.h | 104 +--
sys/arch/i386/include/i82489reg.h | 150 +----
sys/arch/i386/include/i82489var.h | 124 +---
sys/arch/i386/include/ieee.h | 137 +---
sys/arch/i386/include/ieeefp.h | 27 +-
sys/arch/i386/include/intr.h | 332 +---------
sys/arch/i386/include/intrdefs.h | 90 +--
sys/arch/i386/include/isa_machdep.h | 8 +-
sys/arch/i386/include/lock.h | 6 +-
sys/arch/i386/include/mca_machdep.h | 8 +-
sys/arch/i386/include/mpbiosreg.h | 138 +---
sys/arch/i386/include/mpbiosvar.h | 62 +-
sys/arch/i386/include/mpconfig.h | 66 +-
sys/arch/i386/include/mtrr.h | 160 +----
sys/arch/i386/include/param.h | 18 +-
sys/arch/i386/include/pci_machdep.h | 117 +---
sys/arch/i386/include/pic.h | 40 +-
sys/arch/i386/include/pio.h | 232 +------
sys/arch/i386/include/pmap.h | 8 +-
sys/arch/i386/include/psl.h | 84 +--
sys/arch/i386/include/rbus_machdep.h | 6 +-
sys/arch/i386/include/specialreg.h | 576 +----------------
sys/arch/i386/include/trap.h | 75 +--
35 files changed, 98 insertions(+), 4262 deletions(-)
diffs (truncated from 4726 to 300 lines):
diff -r 3352cb878957 -r 9fcacddc2208 sys/arch/i386/include/aout_machdep.h
--- a/sys/arch/i386/include/aout_machdep.h Wed Feb 26 21:28:20 2003 +0000
+++ b/sys/arch/i386/include/aout_machdep.h Wed Feb 26 21:28:59 2003 +0000
@@ -1,49 +1,3 @@
-/* $NetBSD: aout_machdep.h,v 1.7 2002/12/10 17:14:12 thorpej Exp $ */
+/* $NetBSD: aout_machdep.h,v 1.8 2003/02/26 21:28:59 fvdl Exp $ */
-/*
- * Copyright (c) 1993 Christopher G. Demetriou
- * 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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifndef _I386_EXEC_H_
-#define _I386_EXEC_H_
-
-#define AOUT_LDPGSZ 4096
-
-/* Relocation format. */
-struct relocation_info_i386 {
- int r_address; /* offset in text or data segment */
- unsigned int r_symbolnum : 24, /* ordinal number of add symbol */
- r_pcrel : 1, /* 1 if value should be pc-relative */
- r_length : 2, /* log base 2 of value's width */
- r_extern : 1, /* 1 if need to add symbol to value */
- r_baserel : 1, /* linkage table relative */
- r_jmptable : 1, /* relocate to jump table */
- r_relative : 1, /* load address relative */
- r_copy : 1; /* run time copy */
-};
-#define relocation_info relocation_info_i386
-
-#endif /* _I386_EXEC_H_ */
+#include <x86/aout_machdep.h>
diff -r 3352cb878957 -r 9fcacddc2208 sys/arch/i386/include/apicvar.h
--- a/sys/arch/i386/include/apicvar.h Wed Feb 26 21:28:20 2003 +0000
+++ b/sys/arch/i386/include/apicvar.h Wed Feb 26 21:28:59 2003 +0000
@@ -1,57 +1,3 @@
-/* $NetBSD: apicvar.h,v 1.3 2003/01/07 18:48:44 fvdl Exp $ */
+/* $NetBSD: apicvar.h,v 1.4 2003/02/26 21:28:59 fvdl Exp $ */
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by RedBack Networks Inc.
- *
- * Author: Bill Sommerfeld
- *
- * 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 NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _I386_APICVAR_H_
-#define _I386_APICVAR_H_
-
-struct apic_attach_args {
- const char *aaa_name;
- int apic_id;
- int apic_version;
- int flags;
-#define IOAPIC_PICMODE 0x01
-#define IOAPIC_VWIRE 0x02
- paddr_t apic_address;
- int apic_vecbase;
-};
-
-void apic_format_redir __P((char *, char *, int, u_int32_t, u_int32_t));
-
-#endif /* !_I386_APICVAR_H_ */
+#include <x86/apicvar.h>
diff -r 3352cb878957 -r 9fcacddc2208 sys/arch/i386/include/asm.h
--- a/sys/arch/i386/include/asm.h Wed Feb 26 21:28:20 2003 +0000
+++ b/sys/arch/i386/include/asm.h Wed Feb 26 21:28:59 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.22 2002/11/22 15:23:45 fvdl Exp $ */
+/* $NetBSD: asm.h,v 1.23 2003/02/26 21:28:59 fvdl Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -76,6 +76,8 @@
#endif
#define _ASM_LABEL(x) x
+#define CVAR(x) _C_LABEL(x)
+
#ifdef __STDC__
# define __CONCAT(x,y) x ## y
# define __STRING(x) #x
diff -r 3352cb878957 -r 9fcacddc2208 sys/arch/i386/include/atomic.h
--- a/sys/arch/i386/include/atomic.h Wed Feb 26 21:28:20 2003 +0000
+++ b/sys/arch/i386/include/atomic.h Wed Feb 26 21:28:59 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.h,v 1.2 2002/10/01 12:57:03 fvdl Exp $ */
+/* $NetBSD: atomic.h,v 1.3 2003/02/26 21:28:59 fvdl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -44,24 +44,24 @@
#ifndef _LOCORE
static __inline unsigned long
-i386_atomic_testset_ul (volatile u_int32_t *ptr, unsigned long val) {
+x86_atomic_testset_ul (volatile u_int32_t *ptr, unsigned long val) {
__asm__ volatile ("xchgl %0,(%2)" :"=r" (val):"0" (val),"r" (ptr));
return val;
}
static __inline int
-i386_atomic_testset_i (volatile int *ptr, int val) {
+x86_atomic_testset_i (volatile int *ptr, int val) {
__asm__ volatile ("xchgl %0,(%2)" :"=r" (val):"0" (val),"r" (ptr));
return val;
}
static __inline void
-i386_atomic_setbits_l (volatile u_int32_t *ptr, unsigned long bits) {
+x86_atomic_setbits_l (volatile u_int32_t *ptr, unsigned long bits) {
__asm __volatile("lock ; orl %1,%0" : "=m" (*ptr) : "ir" (bits));
}
static __inline void
-i386_atomic_clearbits_l (volatile u_int32_t *ptr, unsigned long bits) {
+x86_atomic_clearbits_l (volatile u_int32_t *ptr, unsigned long bits) {
__asm __volatile("lock ; andl %1,%0" : "=m" (*ptr) : "ir" (~bits));
}
diff -r 3352cb878957 -r 9fcacddc2208 sys/arch/i386/include/bios32.h
--- a/sys/arch/i386/include/bios32.h Wed Feb 26 21:28:20 2003 +0000
+++ b/sys/arch/i386/include/bios32.h Wed Feb 26 21:28:59 2003 +0000
@@ -1,84 +1,3 @@
-/* $NetBSD: bios32.h,v 1.1 1999/11/17 00:55:51 thorpej Exp $ */
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * 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 NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
+/* $NetBSD: bios32.h,v 1.2 2003/02/26 21:28:59 fvdl Exp $ */
-/*
- * Copyright (c) 1999, by UCHIYAMA Yasushi
- * 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. The name of the developer may NOT be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- */
-
-struct bios32_entry_info {
- paddr_t bei_base;
- psize_t bei_size;
- paddr_t bei_entry;
-};
-
-typedef struct bios32_entry_info *bios32_entry_info_t;
-
-struct bios32_entry {
- caddr_t offset;
- u_int16_t segment;
-} __attribute__((__packed__));
-
-typedef struct bios32_entry *bios32_entry_t;
-
-#define BIOS32_MAKESIG(a, b, c, d) \
- ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24))
-
-void bios32_init __P((void));
-int bios32_service __P((u_int32_t, bios32_entry_t, bios32_entry_info_t));
+#include <x86/bios32.h>
diff -r 3352cb878957 -r 9fcacddc2208 sys/arch/i386/include/bootinfo.h
--- a/sys/arch/i386/include/bootinfo.h Wed Feb 26 21:28:20 2003 +0000
+++ b/sys/arch/i386/include/bootinfo.h Wed Feb 26 21:28:59 2003 +0000
@@ -1,152 +1,3 @@
-/* $NetBSD: bootinfo.h,v 1.13 2003/02/23 02:45:44 fvdl Exp $ */
-
-/*
- * Copyright (c) 1997
- * Matthias Drochner. 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 for the NetBSD Project
- * by Matthias Drochner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- *
Home |
Main Index |
Thread Index |
Old Index