Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/chs-ubc2]: src/sys/arch Update from trunk.
details: https://anonhg.NetBSD.org/src/rev/afd5b4aa530c
branches: chs-ubc2
changeset: 471420:afd5b4aa530c
user: thorpej <thorpej%NetBSD.org@localhost>
date: Mon Aug 02 19:46:09 1999 +0000
description:
Update from trunk.
diffstat:
sys/arch/hp300/conf/BASALT | 6 +-
sys/arch/hp300/conf/DISKLESS | 4 +-
sys/arch/hp300/conf/DUALITY | 4 +-
sys/arch/hp300/conf/GENERIC | 6 +-
sys/arch/hp300/conf/GENERIC.v6 | 13 +-
sys/arch/hp300/conf/HAYDON | 6 +-
sys/arch/hp300/conf/KARLA | 3 +-
sys/arch/hp300/conf/LAGER | 3 +-
sys/arch/hp300/conf/Makefile.hp300 | 9 +-
sys/arch/hp300/conf/files.hp300 | 4 +-
sys/arch/hp300/dev/apci.c | 90 +-
sys/arch/hp300/dev/dma.c | 4 +-
sys/arch/hp300/dev/frodo.c | 15 +-
sys/arch/hp300/hp300/genassym.cf | 5 +-
sys/arch/hp300/hp300/intr.c | 56 +-
sys/arch/hp300/hp300/locore.s | 21 +-
sys/arch/hp300/hp300/machdep.c | 44 +-
sys/arch/hp300/hp300/pmap.c | 46 +-
sys/arch/hp300/hp300/sys_machdep.c | 7 +-
sys/arch/hp300/hp300/trap.c | 9 +-
sys/arch/hp300/hp300/vm_machdep.c | 15 +-
sys/arch/hp300/include/hp300spu.h | 9 +-
sys/arch/hp300/include/intr.h | 37 +-
sys/arch/hp300/stand/common/apci.c | 29 +-
sys/arch/hp300/stand/common/autoconf.c | 3 +-
sys/arch/hp300/stand/common/machdep.c | 26 +-
sys/arch/hp300/stand/common/samachdep.h | 4 +-
sys/arch/hp300/stand/common/srt0.S | 30 +-
sys/arch/i386/conf/BIKINI | 63 +-
sys/arch/i386/conf/BOAT_ANCHOR | 3 +-
sys/arch/i386/conf/DISKLESS | 5 +-
sys/arch/i386/conf/GENERIC | 74 +-
sys/arch/i386/conf/GENERIC.v6 | 13 +-
sys/arch/i386/conf/GENERIC_TINY | 6 +-
sys/arch/i386/conf/HOMEWORLD | 6 +-
sys/arch/i386/conf/INSTALL | 11 +-
sys/arch/i386/conf/INSTALL_SMALL | 6 +-
sys/arch/i386/conf/INSTALL_TINY | 6 +-
sys/arch/i386/conf/KICKME | 5 +-
sys/arch/i386/conf/MINBAR | 6 +-
sys/arch/i386/conf/Makefile.i386 | 9 +-
sys/arch/i386/conf/NBFTP | 6 +-
sys/arch/i386/conf/SUN_LAMP | 5 +-
sys/arch/i386/conf/TRINITY | 65 +-
sys/arch/i386/conf/UNDERWORLD | 6 +-
sys/arch/i386/conf/ZHADUM | 6 +-
sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS | 66 +-
sys/arch/i386/conf/files.i386 | 4 +-
sys/arch/i386/conf/std.i386 | 3 +-
sys/arch/i386/i386/apmcall.s | 12 +-
sys/arch/i386/i386/conf.c | 6 +-
sys/arch/i386/i386/gdt.c | 28 +-
sys/arch/i386/i386/locore.s | 9 +-
sys/arch/i386/i386/machdep.c | 20 +-
sys/arch/i386/i386/pmap.c | 5136 +++++++++++++-------------
sys/arch/i386/i386/vm_machdep.c | 27 +-
sys/arch/i386/include/cpu.h | 3 +-
sys/arch/i386/include/pmap.h | 244 +-
sys/arch/i386/isa/pccons.c | 4 +-
sys/arch/i386/pci/pcib.c | 11 +-
sys/arch/i386/stand/Makefile.booters | 10 +-
sys/arch/i386/stand/biosboot/Makefile | 18 +-
sys/arch/i386/stand/genprom/Makefile | 5 +-
sys/arch/i386/stand/lib/netif/3c90xb.c | 4 +-
sys/arch/m68k/conf/files.m68k | 4 +-
sys/arch/m68k/m68k/mappedcopy.c | 8 +-
sys/arch/mac68k/conf/GENERIC | 11 +-
sys/arch/mac68k/conf/GENERIC.v6 | 13 +-
sys/arch/mac68k/conf/INSTALL | 3 +-
sys/arch/mac68k/conf/MYSTERY | 3 +-
sys/arch/mac68k/conf/Makefile.mac68k | 9 +-
sys/arch/mac68k/conf/PUMA | 3 +-
sys/arch/mac68k/conf/SPOT | 3 +-
sys/arch/mac68k/dev/ite.c | 5 +-
sys/arch/mac68k/include/pmap.h | 4 +-
sys/arch/mac68k/mac68k/bus_space.c | 5 +-
sys/arch/mac68k/mac68k/conf.c | 11 +-
sys/arch/mac68k/mac68k/pmap.c | 47 +-
sys/arch/mac68k/mac68k/trap.c | 9 +-
sys/arch/mac68k/mac68k/vm_machdep.c | 15 +-
sys/arch/mac68k/obio/asc.c | 4 +-
sys/arch/mac68k/obio/grf_obio.c | 4 +-
sys/arch/macppc/conf/GENERIC | 20 +-
sys/arch/macppc/conf/GENERIC.v6 | 13 +-
sys/arch/macppc/conf/INSTALL | 3 +-
sys/arch/macppc/conf/Makefile.macppc | 9 +-
sys/arch/macppc/conf/POWERMAC | 3 +-
sys/arch/macppc/conf/files.macppc | 16 +-
sys/arch/macppc/dev/abtn.c | 125 +
sys/arch/macppc/dev/adb_direct.c | 9 +-
sys/arch/macppc/dev/mediabay.c | 184 +
sys/arch/macppc/dev/pm_direct.c | 75 +-
sys/arch/macppc/dev/pm_direct.h | 7 +-
sys/arch/macppc/include/param.h | 4 +-
sys/arch/macppc/include/vmparam.h | 7 +-
sys/arch/macppc/macppc/bus_dma.c | 6 +-
sys/arch/macppc/macppc/conf.c | 6 +-
sys/arch/macppc/macppc/machdep.c | 30 +-
sys/arch/mips/mips/pmap.c | 20 +-
sys/arch/mips/mips/vm_machdep.c | 8 +-
100 files changed, 3876 insertions(+), 3249 deletions(-)
diffs (truncated from 10807 to 300 lines):
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/conf/BASALT
--- a/sys/arch/hp300/conf/BASALT Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/conf/BASALT Mon Aug 02 19:46:09 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BASALT,v 1.27.4.1 1999/07/01 23:07:13 thorpej Exp $
+# $NetBSD: BASALT,v 1.27.4.2 1999/08/02 19:46:09 thorpej Exp $
#
# Kernel for basalt.og.org - thorpej's HP380 file server.
#
@@ -7,7 +7,8 @@
include "arch/hp300/conf/std.hp300"
# Support for various CPU types
-options HP380 # includes 425t, 425s, 433s
+options HP380
+options HP385
options FPSP # floating point interface for 68040
# Need to set locally
@@ -21,6 +22,7 @@
options COMPAT_11 # compatibility with NetBSD 1.1
options COMPAT_12 # compatibility with NetBSD 1.2
options COMPAT_13 # compatibility with NetBSD 1.3
+options COMPAT_14 # compatibility with NetBSD 1.4
options KTRACE # system call tracing support
options NKMEMCLUSTERS=2048 # # 4K pages in kernel malloc pool
options LKM # loadable kernel modules
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/conf/DISKLESS
--- a/sys/arch/hp300/conf/DISKLESS Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/conf/DISKLESS Mon Aug 02 19:46:09 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.25 1998/08/28 04:56:15 thorpej Exp $
+# $NetBSD: DISKLESS,v 1.25.8.1 1999/08/02 19:46:09 thorpej Exp $
#
# Diskless HP 9000/300-series workstation
#
@@ -16,6 +16,7 @@
options HP370
options HP375
options HP380
+options HP385
options HP400
options HP425
options HP433
@@ -31,6 +32,7 @@
options COMPAT_11 # compatibility with NetBSD 1.1
options COMPAT_12 # compatibility with NetBSD 1.2
options COMPAT_13 # compatibility with NetBSD 1.3
+options COMPAT_14 # compatibility with NetBSD 1.4
options SYSVSHM # System V-style shared memory
options SYSVSEM # System V-style semaphores
options SYSVMSG # System V-style message queues
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/conf/DUALITY
--- a/sys/arch/hp300/conf/DUALITY Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/conf/DUALITY Mon Aug 02 19:46:09 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DUALITY,v 1.34 1998/06/26 01:53:54 lukem Exp $
+# $NetBSD: DUALITY,v 1.34.10.1 1999/08/02 19:46:09 thorpej Exp $
#
# Generic kernel - one size fits all.
#
@@ -16,6 +16,7 @@
#options HP370
#options HP375
options HP380
+options HP385
#options HP400
#options HP425
#options HP433
@@ -31,6 +32,7 @@
options COMPAT_11 # compatibility with NetBSD 1.1
options COMPAT_12 # compatibility with NetBSD 1.2
options COMPAT_13 # compatibility with NetBSD 1.3
+options COMPAT_14 # compatibility with NetBSD 1.4
options SYSVSHM # System V-style shared memory
#options SYSVSEM # System V-style semaphores
#options SYSVMSG # System V-style message queues
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/conf/GENERIC
--- a/sys/arch/hp300/conf/GENERIC Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/conf/GENERIC Mon Aug 02 19:46:09 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.43.4.1 1999/06/21 00:49:19 thorpej Exp $
+# $NetBSD: GENERIC,v 1.43.4.2 1999/08/02 19:46:09 thorpej Exp $
#
# Generic kernel - one size fits all.
#
@@ -16,6 +16,7 @@
options HP370
options HP375
options HP380
+options HP385
options HP400
options HP425
options HP433
@@ -31,6 +32,7 @@
options COMPAT_11 # compatibility with NetBSD 1.1
options COMPAT_12 # compatibility with NetBSD 1.2
options COMPAT_13 # compatibility with NetBSD 1.3
+options COMPAT_14 # compatibility with NetBSD 1.4
options SYSVSHM # System V-style shared memory
options SYSVSEM # System V-style semaphores
options SYSVMSG # System V-style message queues
@@ -60,7 +62,7 @@
options GATEWAY # IP forwarding + larger mb_map
options MROUTING # Multicast routing
options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP
-#options PFIL_HOOKS # packet filter hooks
+options PFIL_HOOKS # packet filter hooks
# Options for HP hardware
options FPSP # floating point interface for 68040
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/conf/GENERIC.v6
--- a/sys/arch/hp300/conf/GENERIC.v6 Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/conf/GENERIC.v6 Mon Aug 02 19:46:09 1999 +0000
@@ -1,10 +1,21 @@
-# $NetBSD: GENERIC.v6,v 1.1.2.2 1999/07/01 23:07:13 thorpej Exp $
+# $NetBSD: GENERIC.v6,v 1.1.2.3 1999/08/02 19:46:09 thorpej Exp $
#
# GENERIC.v6 -- IPv6 variant of GENERIC. should be in GENERIC.
#
include "arch/hp300/conf/GENERIC"
+# Pull in config fragments for kernel crypto. Use only one of these,
+# and adjust the prefixes as necessary.
+
+#prefix ../crypto-us/sys
+#cinclude "conf/files.crypto-us"
+#prefix
+
+#prefix ../crypto-intl/sys
+#cinclude "conf/files.crypto-intl"
+#prefix
+
# IPv6 options
options INET6 # IPV6
options IPSEC # IP security
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/conf/HAYDON
--- a/sys/arch/hp300/conf/HAYDON Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/conf/HAYDON Mon Aug 02 19:46:09 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: HAYDON,v 1.7 1998/06/26 01:53:54 lukem Exp $
+# $NetBSD: HAYDON,v 1.7.10.1 1999/08/02 19:46:09 thorpej Exp $
#
# HAYDON
#
@@ -6,7 +6,8 @@
# carrel%NetBSD.org@localhost
#
include "arch/hp300/conf/std.hp300"
-options HP380 # includes 425t, 425s, 433s
+options HP380
+options HP385
options FPSP # floating point emulation for MC68040
makeoptions COPTS="-O2 -m68040"
@@ -48,6 +49,7 @@
options COMPAT_11 # compatibility with NetBSD 1.1 binaries
options COMPAT_12 # compatibility with NetBSD 1.2 binaries
options COMPAT_13 # compatibility with NetBSD 1.3 binaries
+options COMPAT_14 # compatibility with NetBSD 1.4
#options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP
options COMPAT_SUNOS
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/conf/KARLA
--- a/sys/arch/hp300/conf/KARLA Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/conf/KARLA Mon Aug 02 19:46:09 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: KARLA,v 1.6 1998/06/26 01:53:55 lukem Exp $
+# $NetBSD: KARLA,v 1.6.10.1 1999/08/02 19:46:09 thorpej Exp $
#
# KARLA
#
@@ -46,6 +46,7 @@
options COMPAT_11 # compatibility with NetBSD 1.1 binaries
options COMPAT_12 # compatibility with NetBSD 1.2 binaries
options COMPAT_13 # compatibility with NetBSD 1.3 binaries
+options COMPAT_14 # compatibility with NetBSD 1.4
#options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP
options SYSVSHM # System V shared memory
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/conf/LAGER
--- a/sys/arch/hp300/conf/LAGER Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/conf/LAGER Mon Aug 02 19:46:09 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: LAGER,v 1.24 1998/06/26 01:53:55 lukem Exp $
+# $NetBSD: LAGER,v 1.24.10.1 1999/08/02 19:46:09 thorpej Exp $
#
# LAGER (hpeyerl's hp425s)
#
@@ -21,6 +21,7 @@
options COMPAT_11 # compatibility with NetBSD 1.1
options COMPAT_12 # compatibility with NetBSD 1.2
options COMPAT_13 # compatibility with NetBSD 1.3
+options COMPAT_14 # compatibility with NetBSD 1.4
options SYSVSHM # System V-style shared memory
options SYSVSEM # System V-style semaphores
options SYSVMSG # System V-style message queues
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/conf/Makefile.hp300
--- a/sys/arch/hp300/conf/Makefile.hp300 Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/conf/Makefile.hp300 Mon Aug 02 19:46:09 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.hp300,v 1.68 1999/01/15 23:37:06 thorpej Exp $
+# $NetBSD: Makefile.hp300,v 1.68.4.1 1999/08/02 19:46:09 thorpej Exp $
# Makefile for NetBSD
#
@@ -55,6 +55,8 @@
LINKFLAGS= -n -Ttext 0 -e start
STRIPFLAGS= -d
+%INCLUDES
+
HOSTED_CC= ${CC}
HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
HOSTED_CFLAGS= ${CFLAGS}
@@ -111,8 +113,9 @@
.if ${DEBUG} == "-g"
LINKFLAGS+= -X
SYSTEM_LD_TAIL+=; \
- echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
- echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
+ echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
+ echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
+ ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
LINKFLAGS+= -S
.endif
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/conf/files.hp300
--- a/sys/arch/hp300/conf/files.hp300 Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/conf/files.hp300 Mon Aug 02 19:46:09 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hp300,v 1.38.4.1 1999/06/21 00:49:20 thorpej Exp $
+# $NetBSD: files.hp300,v 1.38.4.2 1999/08/02 19:46:09 thorpej Exp $
#
# hp300-specific configuration info
@@ -9,7 +9,7 @@
# SPU configuration options.
defopt opt_spuconf.h HP320 HP330 HP340 HP345 HP350 HP360 HP370
- HP375 HP380 HP400 HP425 HP433
+ HP375 HP380 HP385 HP400 HP425 HP433
# Misc. options.
defopt USELEDS # make the lights twinkle
diff -r e658f42eb831 -r afd5b4aa530c sys/arch/hp300/dev/apci.c
--- a/sys/arch/hp300/dev/apci.c Mon Aug 02 19:34:26 1999 +0000
+++ b/sys/arch/hp300/dev/apci.c Mon Aug 02 19:46:09 1999 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: apci.c,v 1.4 1998/03/28 23:49:06 thorpej Exp $ */
+/* $NetBSD: apci.c,v 1.4.10.1 1999/08/02 19:46:10 thorpej Exp $ */
/*-
- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -153,8 +153,6 @@
void apciinit __P((struct apciregs *, int));
void apcitimeout __P((void *));
-int apcicheckdca __P((void));
-
cdev_decl(apci);
#define APCIUNIT(x) (minor(x) & 0x7ffff)
@@ -212,16 +210,11 @@
case FRODO_APCI_OFFSET(1):
case FRODO_APCI_OFFSET(2):
case FRODO_APCI_OFFSET(3):
- break;
- default:
- return (0);
+ /* Yup, we exist! */
+ return (1);
}
- /* Make sure there's not a DCA in the way. */
- if (fa->fa_offset == FRODO_APCI_OFFSET(1) && apcicheckdca())
- return (0);
-
- return (1);
+ return (0);
}
void
@@ -875,45 +868,6 @@
timeout(apcitimeout, sc, hz);
}
-int
-apcicheckdca()
-{
- caddr_t va;
- int rv = 0;
-
- /*
- * On systems that also have a dca at select code 9, we
Home |
Main Index |
Thread Index |
Old Index