Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/gehenna-devsw]: src/sys/arch catch up with -current.
details: https://anonhg.NetBSD.org/src/rev/17d8bc17109d
branches: gehenna-devsw
changeset: 527219:17d8bc17109d
user: gehenna <gehenna%NetBSD.org@localhost>
date: Mon Jul 15 00:32:57 2002 +0000
description:
catch up with -current.
diffstat:
sys/arch/ofppc/conf/BRIQ | 5 +-
sys/arch/ofppc/conf/GENERIC | 5 +-
sys/arch/ofppc/conf/majors.ofppc | 3 +-
sys/arch/ofppc/ofppc/conf.c | 2 +-
sys/arch/pc532/conf/BULLBOX | 3 +-
sys/arch/pc532/conf/DUMMY | 3 +-
sys/arch/pc532/conf/GENERIC | 5 +-
sys/arch/pc532/conf/KLONDIKE | 3 +-
sys/arch/pc532/conf/SALMON | 3 +-
sys/arch/pc532/conf/STEELHEAD | 3 +-
sys/arch/pc532/conf/majors.pc532 | 3 +-
sys/arch/pc532/include/Makefile | 3 +-
sys/arch/pc532/include/profile.h | 6 +-
sys/arch/pc532/pc532/conf.c | 2 +-
sys/arch/pc532/pc532/trap.c | 33 +-
sys/arch/playstation2/conf/config.playstation2 | 3 +-
sys/arch/playstation2/conf/majors.playstation2 | 3 +-
sys/arch/playstation2/include/locore.h | 2 +-
sys/arch/playstation2/playstation2/bus_dma.c | 3 +-
sys/arch/playstation2/playstation2/conf.c | 2 +-
sys/arch/playstation2/playstation2/kloader.c | 19 +-
sys/arch/pmax/conf/GENERIC | 5 +-
sys/arch/pmax/conf/majors.pmax | 4 +-
sys/arch/pmax/include/locore.h | 10 +-
sys/arch/pmax/pmax/bus_dma.c | 3 +-
sys/arch/pmax/pmax/conf.c | 2 +-
sys/arch/pmppc/conf/INSTALL | 15 +-
sys/arch/pmppc/conf/Makefile | 42 -
sys/arch/pmppc/conf/PMPPC | 329 +++++++++-
sys/arch/pmppc/conf/files.pmppc | 8 +-
sys/arch/pmppc/dev/cpc_mainbus.c | 89 ++
sys/arch/pmppc/dev/ds17485.c | 426 ++++++++++++++
sys/arch/pmppc/dev/flash.c | 93 +++
sys/arch/pmppc/dev/if_cs_mainbus.c | 293 +++++++++
sys/arch/pmppc/include/intr.h | 4 +-
sys/arch/pmppc/include/mainbus.h | 53 +
sys/arch/pmppc/include/pmppc.h | 99 +++
sys/arch/pmppc/pmppc/bus_space.c | 222 +++++++
sys/arch/pmppc/pmppc/conf.c | 2 +-
sys/arch/pmppc/pmppc/extintr.c | 474 +++++++++++++++
sys/arch/pmppc/pmppc/machdep.c | 746 +++++++++++++++++++++++++
sys/arch/pmppc/pmppc/mainbus.c | 181 ++++++
sys/arch/powerpc/ibm4xx/trap.c | 32 +-
sys/arch/powerpc/include/ansi.h | 10 +-
sys/arch/powerpc/include/bus.h | 11 +-
sys/arch/powerpc/include/stdarg.h | 21 +-
sys/arch/powerpc/include/varargs.h | 11 +-
sys/arch/powerpc/mpc6xx/cpu_subr.c | 56 +-
sys/arch/powerpc/mpc6xx/pmap.c | 8 +-
sys/arch/powerpc/powerpc/bus_dma.c | 3 +-
sys/arch/powerpc/powerpc/trap.c | 21 +-
sys/arch/prep/conf/GENERIC | 20 +-
sys/arch/prep/conf/INSTALL | 13 +-
sys/arch/prep/conf/NATSUMI | 131 ++--
sys/arch/prep/conf/files.prep | 4 +-
sys/arch/prep/conf/majors.prep | 3 +-
sys/arch/prep/include/intr.h | 15 +-
sys/arch/prep/include/openpicreg.h | 5 +
sys/arch/prep/include/platform.h | 10 +-
sys/arch/prep/pci/prep_pciconf_indirect.c | 37 +-
sys/arch/prep/prep/autoconf.c | 7 +-
sys/arch/prep/prep/conf.c | 2 +-
sys/arch/prep/prep/extintr.c | 201 ++++++-
sys/arch/prep/prep/ibm_6050.c | 8 +-
sys/arch/prep/prep/ibm_7043_140.c | 105 +++
sys/arch/prep/prep/ibm_7248.c | 8 +-
sys/arch/prep/prep/ibm_machdep.c | 5 +-
sys/arch/prep/prep/machdep.c | 29 +-
sys/arch/prep/prep/mot_ulmb60xa.c | 7 +-
sys/arch/prep/prep/platform.c | 4 +-
70 files changed, 3638 insertions(+), 363 deletions(-)
diffs (truncated from 5464 to 300 lines):
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/ofppc/conf/BRIQ
--- a/sys/arch/ofppc/conf/BRIQ Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/ofppc/conf/BRIQ Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BRIQ,v 1.7 2002/04/25 15:06:34 atatat Exp $
+# $NetBSD: BRIQ,v 1.7.2.1 2002/07/15 00:32:57 gehenna Exp $
#
# BRIQ -- Total Impact briQ -- http://www.totalimpact.com
#
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.7 $"
+#ident "GENERIC-$Revision: 1.7.2.1 $"
maxusers 32
@@ -156,3 +156,4 @@
#pseudo-device bridge # simple inter-network bridging
pseudo-device pty # pseudo-terminals
pseudo-device rnd # /dev/random and in-kernel generator
+pseudo-device clockctl # user control of clock subsystem
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/ofppc/conf/GENERIC
--- a/sys/arch/ofppc/conf/GENERIC Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/ofppc/conf/GENERIC Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.52 2002/04/25 15:06:34 atatat Exp $
+# $NetBSD: GENERIC,v 1.52.2.1 2002/07/15 00:32:58 gehenna Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.52 $"
+#ident "GENERIC-$Revision: 1.52.2.1 $"
maxusers 32
@@ -176,3 +176,4 @@
pseudo-device bridge # simple inter-network bridging
pseudo-device pty # pseudo-terminals
pseudo-device rnd # /dev/random and in-kernel generator
+pseudo-device clockctl # user control of clock subsystem
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/ofppc/conf/majors.ofppc
--- a/sys/arch/ofppc/conf/majors.ofppc Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/ofppc/conf/majors.ofppc Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: majors.ofppc,v 1.1.2.2 2002/05/30 07:14:49 gehenna Exp $
+# $NetBSD: majors.ofppc,v 1.1.2.3 2002/07/15 00:32:58 gehenna Exp $
#
# Device majors for ofppc
#
@@ -23,3 +23,4 @@
device-major md char 17 block 6 md
device-major ld char 18 block 7 ld
device-major clockctl char 19 clockctl
+device-major systrace char 20 systrace
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/ofppc/ofppc/conf.c
--- a/sys/arch/ofppc/ofppc/conf.c Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/ofppc/ofppc/conf.c Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.11.8.1 2002/05/16 13:22:40 gehenna Exp $ */
+/* $NetBSD: conf.c,v 1.11.8.2 2002/07/15 00:32:59 gehenna Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/conf/BULLBOX
--- a/sys/arch/pc532/conf/BULLBOX Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/conf/BULLBOX Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BULLBOX,v 1.12 2002/04/25 15:06:35 atatat Exp $
+# $NetBSD: BULLBOX,v 1.12.2.1 2002/07/15 00:32:59 gehenna Exp $
#
# BULLBOX: Kernel for Jon Buller's machine
#
@@ -85,3 +85,4 @@
pseudo-device rnd # kernel random number generator
pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
pseudo-device faith 1 # IPv[46] tcp relay translation i/f
+pseudo-device clockctl # user control of clock subsystem
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/conf/DUMMY
--- a/sys/arch/pc532/conf/DUMMY Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/conf/DUMMY Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DUMMY,v 1.19 2002/04/25 15:06:35 atatat Exp $
+# $NetBSD: DUMMY,v 1.19.2.1 2002/07/15 00:32:59 gehenna Exp $
#
# DUMMY: Matthias Pfaller's second pc532
#
@@ -81,3 +81,4 @@
#pseudo-device sl 1 # compressed SLIP
#pseudo-device ppp 1 # Point-to-Point Protocol
#pseudo-device tun 1 # ip tunneling
+pseudo-device clockctl # user control of clock subsystem
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/conf/GENERIC
--- a/sys/arch/pc532/conf/GENERIC Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/conf/GENERIC Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.27 2002/04/25 15:06:35 atatat Exp $
+# $NetBSD: GENERIC,v 1.27.2.1 2002/07/15 00:33:00 gehenna Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.27 $"
+#ident "GENERIC-$Revision: 1.27.2.1 $"
maxusers 8 # estimated number of users
@@ -103,3 +103,4 @@
pseudo-device bridge # simple inter-network bridging
pseudo-device ccd 4 # Concatenated Disk Driver
pseudo-device rnd # kernel random number generator
+pseudo-device clockctl # user control of clock subsystem
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/conf/KLONDIKE
--- a/sys/arch/pc532/conf/KLONDIKE Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/conf/KLONDIKE Mon Jul 15 00:32:57 2002 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: KLONDIKE,v 1.23 2002/04/25 15:06:35 atatat Exp $
+# $NetBSD: KLONDIKE,v 1.23.2.1 2002/07/15 00:33:00 gehenna Exp $
#
# KLONDIKE: Matthias Pfaller's pc532
#
@@ -92,3 +92,4 @@
pseudo-device sl 1 # compressed SLIP
pseudo-device ppp 1 # Point-to-Point Protocol
pseudo-device tun 1 # ip tunneling
+pseudo-device clockctl # user control of clock subsystem
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/conf/SALMON
--- a/sys/arch/pc532/conf/SALMON Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/conf/SALMON Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SALMON,v 1.17 2002/04/25 15:06:35 atatat Exp $
+# $NetBSD: SALMON,v 1.17.2.1 2002/07/15 00:33:00 gehenna Exp $
#
# SALMON: Phil Nelson's 2nd (test) pc532
#
@@ -71,3 +71,4 @@
pseudo-device ppp 2 # Point-to-Point Protocol
pseudo-device vnd 4 # Vnode devices
#pseudo-device ether #
+pseudo-device clockctl # user control of clock subsystem
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/conf/STEELHEAD
--- a/sys/arch/pc532/conf/STEELHEAD Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/conf/STEELHEAD Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: STEELHEAD,v 1.32 2002/04/25 15:06:35 atatat Exp $
+# $NetBSD: STEELHEAD,v 1.32.2.1 2002/07/15 00:33:00 gehenna Exp $
#
# STEELHEAD: Phil Nelson's pc532
#
@@ -73,3 +73,4 @@
pseudo-device ppp 2 # Point-to-Point Protocol
pseudo-device vnd 4 # Vnode devices
#pseudo-device ether #
+pseudo-device clockctl # user control of clock subsystem
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/conf/majors.pc532
--- a/sys/arch/pc532/conf/majors.pc532 Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/conf/majors.pc532 Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: majors.pc532,v 1.1.2.2 2002/05/30 07:14:49 gehenna Exp $
+# $NetBSD: majors.pc532,v 1.1.2.3 2002/07/15 00:33:00 gehenna Exp $
#
# Device majors for pc532
#
@@ -32,3 +32,4 @@
device-major scsibus char 30 scsibus
device-major raid char 31 block 13 raid
device-major clockctl char 32 clockctl
+device-major systrace char 33 systrace
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/include/Makefile
--- a/sys/arch/pc532/include/Makefile Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/include/Makefile Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12.14.1 2002/05/19 08:31:25 gehenna Exp $
+# $NetBSD: Makefile,v 1.12.14.2 2002/07/15 00:33:01 gehenna Exp $
KDIR= /sys/arch/pc532/include
INCSDIR= /usr/include/pc532
@@ -11,6 +11,7 @@
float.h fpu.h frame.h \
icu.h ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
+ intr.h \
jmpbuf.h \
kcore.h \
limits.h lock.h \
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/include/profile.h
--- a/sys/arch/pc532/include/profile.h Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/include/profile.h Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: profile.h,v 1.6 1997/11/05 04:16:06 thorpej Exp $ */
+/* $NetBSD: profile.h,v 1.6.38.1 2002/07/15 00:33:01 gehenna Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -39,10 +39,10 @@
*/
/* profiles ... */
-static __inline void _mcount __P((u_long, u_long));
+__inline void _mcount __P((u_long, u_long));
void mcount(void);
-#define _MCOUNT_DECL static __inline void _mcount
+#define _MCOUNT_DECL __inline void _mcount
#define MCOUNT \
extern void mcount(void) __asm__("mcount"); \
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/pc532/conf.c
--- a/sys/arch/pc532/pc532/conf.c Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/pc532/conf.c Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.39.8.1 2002/05/16 13:22:40 gehenna Exp $ */
+/* $NetBSD: conf.c,v 1.39.8.2 2002/07/15 00:33:01 gehenna Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/pc532/pc532/trap.c
--- a/sys/arch/pc532/pc532/trap.c Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/pc532/pc532/trap.c Mon Jul 15 00:32:57 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.47 2002/02/14 07:08:12 chs Exp $ */
+/* $NetBSD: trap.c,v 1.47.8.1 2002/07/15 00:33:01 gehenna Exp $ */
/*-
* Copyright (c) 1996 Matthias Pfaller. All rights reserved.
@@ -48,6 +48,7 @@
#include "opt_kgdb.h"
#include "opt_syscall_debug.h"
#include "opt_ktrace.h"
+#include "opt_systrace.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,6 +60,9 @@
#ifdef KTRACE
#include <sys/ktrace.h>
#endif
+#ifdef SYSTRACE
+#include <sys/systrace.h>
+#endif
#include <sys/syscall.h>
#ifdef KGDB
#include <sys/kgdb.h>
@@ -519,19 +523,15 @@
else
callp += code;
argsize = callp->sy_argsize;
- if (argsize)
+ if (argsize) {
error = copyin(params, (caddr_t)args, argsize);
- else
- error = 0;
-#ifdef SYSCALL_DEBUG
- scdebug_call(p, code, args);
-#endif
-#ifdef KTRACE
- if (KTRPOINT(p, KTR_SYSCALL))
- ktrsyscall(p, code, argsize, args);
-#endif
- if (error)
+ if (error)
+ goto bad;
+ }
+
+ if ((error = trace_enter(p, code, args, rval)) != 0)
goto bad;
+
rval[0] = 0;
rval[1] = frame.sf_regs.r_r1;
error = (*callp->sy_call)(p, args, rval);
@@ -564,14 +564,9 @@
break;
}
-#ifdef SYSCALL_DEBUG
- scdebug_ret(p, code, error, rval);
-#endif
+ trace_exit(p, code, args, rval, error);
+
userret(p, frame.sf_regs.r_pc, sticks);
-#ifdef KTRACE
- if (KTRPOINT(p, KTR_SYSRET))
- ktrsysret(p, code, error, rval[0]);
-#endif
}
void
diff -r 3635b323c43c -r 17d8bc17109d sys/arch/playstation2/conf/config.playstation2
--- a/sys/arch/playstation2/conf/config.playstation2 Mon Jul 15 00:07:22 2002 +0000
+++ b/sys/arch/playstation2/conf/config.playstation2 Mon Jul 15 00:32:57 2002 +0000
@@ -1,7 +1,7 @@
Home |
Main Index |
Thread Index |
Old Index