Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej_scsipi]: src/sys/arch/amiga Update thorpej_scsipi to -current as...
details: https://anonhg.NetBSD.org/src/rev/5cfa7608020d
branches: thorpej_scsipi
changeset: 477327:5cfa7608020d
user: bouyer <bouyer%NetBSD.org@localhost>
date: Mon Nov 20 19:58:16 2000 +0000
description:
Update thorpej_scsipi to -current as of a month ago
A i386 GENERIC kernel compiles without the siop, ahc and bha drivers
(will be updated later). i386 IDE/ATAPI and ncr work, as well as
sparc/esp_sbus. alpha should work as well (untested yet).
siop, ahc and bha will be updated once I've updated the branch to current
-current, as well as machine-dependant code.
I updated the amiga SCSI drivers, but completely untested yet (may not even
compile)
diffstat:
sys/arch/amiga/amiga/amiga_bus_simple_16.c | 43 +
sys/arch/amiga/amiga/amiga_bus_simple_1word.c | 42 +
sys/arch/amiga/amiga/amiga_bus_simple_2word.c | 42 +
sys/arch/amiga/amiga/amiga_bus_simple_4.c | 120 ++++
sys/arch/amiga/amiga/amiga_init.c | 9 +-
sys/arch/amiga/amiga/autoconf.c | 70 +-
sys/arch/amiga/amiga/conf.c | 11 +-
sys/arch/amiga/amiga/db_memrw.c | 4 +-
sys/arch/amiga/amiga/disksubr.c | 28 +-
sys/arch/amiga/amiga/gayle.c | 29 +
sys/arch/amiga/amiga/gayle.h | 54 +
sys/arch/amiga/amiga/genassym.cf | 5 +-
sys/arch/amiga/amiga/locore.s | 236 ++++---
sys/arch/amiga/amiga/machdep.c | 142 +---
sys/arch/amiga/amiga/mem.c | 31 +-
sys/arch/amiga/amiga/pmap.c | 42 +-
sys/arch/amiga/amiga/simple_busfuncs.c | 426 ++++++++++++++
sys/arch/amiga/amiga/sys_machdep.c | 11 +-
sys/arch/amiga/amiga/trap.c | 32 +-
sys/arch/amiga/amiga/vm_machdep.c | 72 +-
sys/arch/amiga/conf/AMIGA | 68 ++-
sys/arch/amiga/conf/DRACO | 45 +-
sys/arch/amiga/conf/GENERIC | 94 ++-
sys/arch/amiga/conf/INSTALL | 337 +++++++++++
sys/arch/amiga/conf/INSTWDCPCM | 337 +++++++++++
sys/arch/amiga/conf/MDINSTALL | 5 +-
sys/arch/amiga/conf/Makefile | 21 +-
sys/arch/amiga/conf/Makefile.amiga | 25 +-
sys/arch/amiga/conf/RAMDISK | 6 +-
sys/arch/amiga/conf/files.amiga | 57 +-
sys/arch/amiga/conf/std.amiga | 2 +-
sys/arch/amiga/dev/a2kbbc.c | 17 +-
sys/arch/amiga/dev/a34kbbc.c | 26 +-
sys/arch/amiga/dev/afsc.c | 47 +-
sys/arch/amiga/dev/ahsc.c | 52 +-
sys/arch/amiga/dev/aster.c | 4 +-
sys/arch/amiga/dev/atzsc.c | 50 +-
sys/arch/amiga/dev/aucc.c | 17 +-
sys/arch/amiga/dev/bzivsc.c | 17 +-
sys/arch/amiga/dev/bzsc.c | 17 +-
sys/arch/amiga/dev/bztzsc.c | 17 +-
sys/arch/amiga/dev/cbiiisc.c | 59 +-
sys/arch/amiga/dev/cbiisc.c | 17 +-
sys/arch/amiga/dev/cbsc.c | 17 +-
sys/arch/amiga/dev/clock.c | 4 +-
sys/arch/amiga/dev/drbbc.c | 12 +-
sys/arch/amiga/dev/drsc.c | 61 +-
sys/arch/amiga/dev/drsupio.c | 13 +-
sys/arch/amiga/dev/empsc.c | 48 +-
sys/arch/amiga/dev/fd.c | 76 +-
sys/arch/amiga/dev/flsc.c | 17 +-
sys/arch/amiga/dev/gayle_pcmcia.c | 608 +++++++++++++++++++++
sys/arch/amiga/dev/grf.c | 16 +-
sys/arch/amiga/dev/grf_cc.c | 5 +-
sys/arch/amiga/dev/grf_rhreg.h | 4 +-
sys/arch/amiga/dev/grf_rtreg.h | 4 +-
sys/arch/amiga/dev/grfabs_cc.c | 9 +-
sys/arch/amiga/dev/gtsc.c | 47 +-
sys/arch/amiga/dev/gvpio.c | 4 +-
sys/arch/amiga/dev/hyper.c | 4 +-
sys/arch/amiga/dev/idesc.c | 193 +++---
sys/arch/amiga/dev/if_bah_zbus.c | 4 +-
sys/arch/amiga/dev/if_ed.c | 22 +-
sys/arch/amiga/dev/if_es.c | 28 +-
sys/arch/amiga/dev/if_ne_zbus.c | 24 +-
sys/arch/amiga/dev/if_qn.c | 22 +-
sys/arch/amiga/dev/ioblix_zbus.c | 162 +++++
sys/arch/amiga/dev/ite.c | 19 +-
sys/arch/amiga/dev/ite_cc.c | 43 +-
sys/arch/amiga/dev/ivsc.c | 48 +-
sys/arch/amiga/dev/kbd.c | 4 +-
sys/arch/amiga/dev/melody.c | 4 +-
sys/arch/amiga/dev/mgnsc.c | 47 +-
sys/arch/amiga/dev/mlhsc.c | 47 +-
sys/arch/amiga/dev/ms.c | 124 ++-
sys/arch/amiga/dev/otgsc.c | 47 +-
sys/arch/amiga/dev/par.c | 79 +-
sys/arch/amiga/dev/rtc.h | 5 +-
sys/arch/amiga/dev/sbic.c | 296 +++++-----
sys/arch/amiga/dev/sbicvar.h | 9 +-
sys/arch/amiga/dev/sci.c | 113 +--
sys/arch/amiga/dev/scivar.h | 12 +-
sys/arch/amiga/dev/ser.c | 30 +-
sys/arch/amiga/dev/siop.c | 174 +++--
sys/arch/amiga/dev/siop2.c | 188 +++--
sys/arch/amiga/dev/siopvar.h | 10 +-
sys/arch/amiga/dev/view.c | 9 +-
sys/arch/amiga/dev/wdc_amiga.c | 166 +++++
sys/arch/amiga/dev/wesc.c | 48 +-
sys/arch/amiga/dev/wstsc.c | 48 +-
sys/arch/amiga/dev/zbus.c | 18 +-
sys/arch/amiga/dev/zbusvar.h | 7 +-
sys/arch/amiga/include/Makefile | 12 +-
sys/arch/amiga/include/bus.h | 273 ++++-----
sys/arch/amiga/include/cpu.h | 23 +-
sys/arch/amiga/include/endian.h | 4 +-
sys/arch/amiga/include/endian_machdep.h | 3 +
sys/arch/amiga/include/int_types.h | 3 +
sys/arch/amiga/include/intr.h | 9 +-
sys/arch/amiga/include/lock.h | 4 +
sys/arch/amiga/include/math.h | 3 +
sys/arch/amiga/include/param.h | 10 +-
sys/arch/amiga/include/pcb.h | 6 +-
sys/arch/amiga/include/psl.h | 4 +-
sys/arch/amiga/include/svr4_machdep.h | 7 +-
sys/arch/amiga/include/types.h | 4 +-
sys/arch/amiga/include/vmparam.h | 27 +-
sys/arch/amiga/stand/bootblock/Makefile.inc | 6 +-
sys/arch/amiga/stand/bootblock/boot/Makefile | 6 +-
sys/arch/amiga/stand/bootblock/boot/main.c | 59 +-
sys/arch/amiga/stand/bootblock/ppcboot/Makefile | 111 +++
sys/arch/amiga/stand/bootblock/ppcboot/hex2c.awk | 43 +
sys/arch/amiga/stand/bootblock/ppcboot/kickstart.S | 128 ++++
sys/arch/amiga/stand/bootblock/ppcboot/ppcstart.c | 78 ++
sys/arch/amiga/stand/loadbsd/loadbsd.c | 19 +-
sys/arch/amiga/stand/loadkmap/Makefile.inc | 12 +-
sys/arch/amiga/stand/loadkmap/din/Makefile | 10 +-
sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c | 12 +-
sys/arch/amiga/stand/loadkmap/es/Makefile | 10 +-
sys/arch/amiga/stand/loadkmap/es/es-kbdmap.c | 12 +-
sys/arch/amiga/stand/loadkmap/fr/Makefile | 10 +-
sys/arch/amiga/stand/loadkmap/fr/fr-kbdmap.c | 16 +-
sys/arch/amiga/stand/loadkmap/sw/Makefile | 10 +-
sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c | 13 +-
sys/arch/amiga/stand/loadkmap/us/Makefile | 10 +-
sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c | 11 +-
126 files changed, 4855 insertions(+), 1898 deletions(-)
diffs (truncated from 11761 to 300 lines):
diff -r b7681b781a56 -r 5cfa7608020d sys/arch/amiga/amiga/amiga_bus_simple_16.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amiga/amiga/amiga_bus_simple_16.c Mon Nov 20 19:58:16 2000 +0000
@@ -0,0 +1,43 @@
+/* $NetBSD: amiga_bus_simple_16.c,v 1.1.6.2 2000/11/20 19:58:16 bouyer Exp $ */
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Ignatios Souvatzis.
+ *
+ * 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.
+ */
+
+#define AMIGA_SIMPLE_BUS_STRIDE 16 /* 1 byte per 16 bytes */
+/*#define AMIGA_SIMPLE_BUS_WORD_METHODS*/
+
+#include "simple_busfuncs.c"
+
diff -r b7681b781a56 -r 5cfa7608020d sys/arch/amiga/amiga/amiga_bus_simple_1word.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amiga/amiga/amiga_bus_simple_1word.c Mon Nov 20 19:58:16 2000 +0000
@@ -0,0 +1,42 @@
+/* $NetBSD: amiga_bus_simple_1word.c,v 1.1.6.2 2000/11/20 19:58:17 bouyer Exp $ */
+
+/*-
+ * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Ignatios Souvatzis.
+ *
+ * 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.
+ */
+
+#define AMIGA_SIMPLE_BUS_STRIDE 1 /* 1 byte per word */
+#define AMIGA_SIMPLE_BUS_WORD_METHODS
+
+#include "simple_busfuncs.c"
diff -r b7681b781a56 -r 5cfa7608020d sys/arch/amiga/amiga/amiga_bus_simple_2word.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amiga/amiga/amiga_bus_simple_2word.c Mon Nov 20 19:58:16 2000 +0000
@@ -0,0 +1,42 @@
+/* $NetBSD: amiga_bus_simple_2word.c,v 1.2.6.2 2000/11/20 19:58:17 bouyer Exp $ */
+
+/*-
+ * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Ignatios Souvatzis.
+ *
+ * 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.
+ */
+
+#define AMIGA_SIMPLE_BUS_STRIDE 2 /* 1 byte per word */
+#define AMIGA_SIMPLE_BUS_WORD_METHODS
+
+#include "simple_busfuncs.c"
diff -r b7681b781a56 -r 5cfa7608020d sys/arch/amiga/amiga/amiga_bus_simple_4.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amiga/amiga/amiga_bus_simple_4.c Mon Nov 20 19:58:16 2000 +0000
@@ -0,0 +1,120 @@
+/* $NetBSD: amiga_bus_simple_4.c,v 1.2.6.2 2000/11/20 19:58:17 bouyer Exp $ */
+
+/*-
+ * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Ignatios Souvatzis.
+ *
+ * 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.
+ */
+
+#define AMIGA_SIMPLE_BUS_STRIDE 4 /* 1 byte per long */
+#define AMIGA_SIMPLE_BUS_WORD_METHODS
+
+#include "simple_busfuncs.c"
+
+/*
+ * Little-endian word methods.
+ * Stream access does not swap, used for 16-bit wide transfers of byte streams.
+ * Non-stream access swaps bytes.
+ * XXX Only *_multi_2 transfers currently swap bytes XXX
+ */
+
+bsrm(oabs(bsrm2_swap_), u_int16_t);
+bswm(oabs(bswm2_swap_), u_int16_t);
+
+void
+oabs(bsrm2_swap_)(handle, offset, pointer, count)
+ bus_space_handle_t handle;
+ bus_size_t offset;
+ u_int16_t *pointer;
+ bus_size_t count;
+{
+ volatile u_int16_t *p;
+
+ p = (volatile u_int16_t *)(handle + offset * AMIGA_SIMPLE_BUS_STRIDE);
+
+ while (count > 0) {
+ *pointer++ = bswap16(*p);
+ --count;
+ }
+}
+
+void
+oabs(bswm2_swap_)(handle, offset, pointer, count)
+ bus_space_handle_t handle;
+ bus_size_t offset;
+ const u_int16_t *pointer;
+ bus_size_t count;
+{
+ volatile u_int16_t *p;
+
+ p = (volatile u_int16_t *)(handle + offset * AMIGA_SIMPLE_BUS_STRIDE);
+
+ while (count > 0) {
+ *p = bswap16(*pointer);
+ ++pointer;
+ --count;
+ }
+}
+
+const struct amiga_bus_space_methods amiga_bus_stride_4swap = {
+
+ oabs(bsm_),
+ oabs(bsms_),
+ oabs(bsu_),
+ 0,
+ 0,
+
+ oabs(bsr1_),
+ oabs(bsw1_),
+ oabs(bsrm1_),
+ oabs(bswm1_),
+ oabs(bsrr1_),
+ oabs(bswr1_),
+ oabs(bssr1_),
+ oabs(bscr1_),
+
+ oabs(bsr2_), /* XXX swap? */
+ oabs(bsw2_), /* XXX swap? */
+ oabs(bsr2_),
+ oabs(bsw2_),
+ oabs(bsrm2_swap_),
+ oabs(bswm2_swap_),
+ oabs(bsrm2_),
+ oabs(bswm2_),
+ oabs(bsrr2_), /* XXX swap? */
+ oabs(bswr2_), /* XXX swap? */
+ oabs(bsrr2_),
+ oabs(bswr2_),
+ oabs(bssr2_), /* XXX swap? */
+ oabs(bscr2_) /* XXX swap? */
+};
diff -r b7681b781a56 -r 5cfa7608020d sys/arch/amiga/amiga/amiga_init.c
--- a/sys/arch/amiga/amiga/amiga_init.c Mon Nov 20 19:56:18 2000 +0000
+++ b/sys/arch/amiga/amiga/amiga_init.c Mon Nov 20 19:58:16 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amiga_init.c,v 1.67.2.1 1999/10/20 22:01:48 thorpej Exp $ */
+/* $NetBSD: amiga_init.c,v 1.67.2.2 2000/11/20 19:58:17 bouyer Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -37,7 +37,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <sys/user.h>
#include <sys/ioctl.h>
#include <sys/select.h>
@@ -51,8 +51,6 @@
#include <sys/dkbad.h>
#include <sys/reboot.h>
#include <sys/exec.h>
-#include <vm/pmap.h>
-#include <machine/vmparam.h>
#include <machine/pte.h>
#include <machine/cpu.h>
#include <amiga/amiga/cc.h>
@@ -60,6 +58,7 @@
#include <amiga/amiga/custom.h>
#include <amiga/amiga/cfdev.h>
#include <amiga/amiga/drcustom.h>
+#include <amiga/amiga/gayle.h>
#include <amiga/amiga/memlist.h>
#include <amiga/dev/zbusvar.h>
@@ -380,7 +379,7 @@
} else
Home |
Main Index |
Thread Index |
Old Index