Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nathanw_sa]: src/sys/arch Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/99e42f8f09c8
branches: nathanw_sa
changeset: 506699:99e42f8f09c8
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue Jan 07 21:07:40 2003 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/evbppc/Makefile | 7 +-
sys/arch/evbppc/compile/Makefile | 3 +
sys/arch/evbppc/conf/Makefile.walnut.inc | 6 +-
sys/arch/evbppc/walnut/machdep.c | 6 +-
sys/arch/evbppc/walnut/walnut_start.S | 5 +-
sys/arch/evbsh3/Makefile | 4 +-
sys/arch/evbsh3/compile/Makefile | 3 +
sys/arch/hp300/Makefile | 4 +-
sys/arch/hp300/compile/.keep_me | 3 -
sys/arch/hp300/compile/Makefile | 3 +
sys/arch/hp300/dev/dcmreg.h | 10 +-
sys/arch/hp300/stand/inst/Makefile | 16 +-
sys/arch/hp300/stand/uboot/Makefile | 16 +-
sys/arch/hpcarm/Makefile | 4 +-
sys/arch/hpcarm/compile/.keep_me | 3 -
sys/arch/hpcarm/compile/Makefile | 3 +
sys/arch/hpcarm/dev/j720ssp.c | 3 +-
sys/arch/hpcmips/Makefile | 4 +-
sys/arch/hpcmips/compile/Makefile | 3 +
sys/arch/hpcmips/dev/ucbtp.c | 3 +-
sys/arch/hpcmips/vr/rtc.c | 4 +-
sys/arch/hpcmips/vr/vrpiu.c | 11 +-
sys/arch/hpcsh/Makefile | 4 +-
sys/arch/hpcsh/compile/Makefile | 3 +
sys/arch/i386/Makefile | 4 +-
sys/arch/i386/compile/.keep_me | 3 -
sys/arch/i386/compile/Makefile | 3 +
sys/arch/i386/conf/GENERIC | 37 +-
sys/arch/i386/conf/GENERIC.MP | 5 +-
sys/arch/i386/conf/GENERIC_LAPTOP | 31 +-
sys/arch/i386/conf/HYDRA | 8 +-
sys/arch/i386/conf/SWINGER.MP | 3 +-
sys/arch/i386/conf/files.i386 | 16 +-
sys/arch/i386/i386/acpi_machdep.c | 17 +-
sys/arch/i386/i386/cpu.c | 84 +++-
sys/arch/i386/i386/db_memrw.c | 6 +-
sys/arch/i386/i386/ioapic.c | 31 +-
sys/arch/i386/i386/lapic.c | 15 +-
sys/arch/i386/i386/mainbus.c | 97 +++-
sys/arch/i386/i386/mpacpi.c | 718 ++++++++++++++++++++++++++++++
sys/arch/i386/i386/mpbios.c | 94 +---
sys/arch/i386/i386/pmap.c | 10 +-
sys/arch/i386/i386/spl.S | 5 +-
sys/arch/i386/include/acpi_machdep.h | 3 +-
sys/arch/i386/include/apicvar.h | 3 +-
sys/arch/i386/include/cpu.h | 4 +-
sys/arch/i386/include/cpuvar.h | 4 +-
sys/arch/i386/include/i82093var.h | 14 +-
sys/arch/i386/include/mpacpi.h | 9 +
sys/arch/i386/include/mpbiosreg.h | 20 +-
sys/arch/i386/include/mpbiosvar.h | 35 +-
sys/arch/i386/include/mpconfig.h | 65 ++
sys/arch/i386/include/specialreg.h | 5 +-
sys/arch/i386/stand/dosboot/Makefile | 13 +-
sys/arch/i386/stand/misc/Makefile | 5 +-
sys/arch/luna68k/Makefile | 4 +-
sys/arch/luna68k/compile/.keep_me | 3 -
sys/arch/luna68k/compile/Makefile | 3 +
sys/arch/luna68k/luna68k/isr.h | 4 +-
sys/arch/mac68k/Makefile | 33 +
sys/arch/mac68k/compile/.keep_me | 3 -
sys/arch/mac68k/compile/Makefile | 3 +
sys/arch/mac68k/dev/zs.c | 6 +-
sys/arch/mac68k/mac68k/machdep.c | 8 +-
sys/arch/mac68k/obio/iwm_fd.c | 6 +-
sys/arch/mac68k/obio/iwmreg.h | 4 +-
sys/arch/macppc/Makefile | 4 +-
sys/arch/macppc/compile/Makefile | 3 +
sys/arch/macppc/conf/majors.macppc | 3 +-
sys/arch/mips/mips/pmap.c | 6 +-
sys/arch/mips/sibyte/include/sb1250_scd.h | 2 +-
sys/arch/mipsco/Makefile | 4 +-
sys/arch/mipsco/compile/.keep_me | 3 -
sys/arch/mipsco/compile/Makefile | 3 +
sys/arch/mmeye/Makefile | 4 +-
sys/arch/mmeye/compile/Makefile | 3 +
sys/arch/mvme68k/Makefile | 4 +-
sys/arch/mvme68k/compile/.keep_me | 1 -
sys/arch/mvme68k/compile/Makefile | 3 +
sys/arch/mvme68k/dev/pcc.c | 4 +-
sys/arch/mvme68k/mvme68k/isr.h | 4 +-
sys/arch/mvmeppc/Makefile | 4 +-
sys/arch/mvmeppc/compile/Makefile | 3 +
sys/arch/netwinder/Makefile | 29 +
sys/arch/netwinder/compile/Makefile | 3 +
sys/arch/news68k/Makefile | 4 +-
sys/arch/news68k/compile/.keep_me | 3 -
sys/arch/news68k/compile/Makefile | 3 +
sys/arch/news68k/news68k/isr.h | 4 +-
sys/arch/newsmips/Makefile | 4 +-
sys/arch/newsmips/compile/.keep_me | 3 -
sys/arch/newsmips/compile/Makefile | 3 +
sys/arch/next68k/Makefile | 43 +
sys/arch/next68k/compile/.keep_me | 3 -
sys/arch/next68k/compile/Makefile | 3 +
sys/arch/next68k/next68k/isr.h | 4 +-
sys/arch/ofppc/Makefile | 4 +-
sys/arch/ofppc/compile/.keep_me | 3 -
sys/arch/ofppc/compile/Makefile | 3 +
sys/arch/playstation2/Makefile | 5 +
sys/arch/playstation2/compile/Makefile | 3 +
sys/arch/playstation2/dev/if_smap.c | 4 +-
sys/arch/pmax/Makefile | 4 +-
sys/arch/pmax/compile/.keep_me | 3 -
sys/arch/pmax/compile/Makefile | 3 +
sys/arch/pmax/pmax/interrupt.c | 4 +-
sys/arch/pmax/tc/scc.c | 6 +-
107 files changed, 1414 insertions(+), 370 deletions(-)
diffs (truncated from 3163 to 300 lines):
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/evbppc/Makefile
--- a/sys/arch/evbppc/Makefile Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/evbppc/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.1.2.2 2002/12/11 06:28:56 thorpej Exp $
+# $NetBSD: Makefile,v 1.1.2.3 2003/01/07 21:07:40 thorpej Exp $
ETAGS?= etags
-SUBDIR= include
-
# XXX Fix this to deal with multiple "evbppc" ports.
SEVBPPC= evbppc/*.[ch] include/*.h
AEVBPPC=
@@ -30,4 +28,7 @@
"--regex=/^ENTRY(\(.*\)):/\1/" "--regex=/^ASENTRY(\(.*\)):/\1/" \
${APPC} ${AEVBPPC}
+
+SUBDIR= compile include
+
.include <bsd.subdir.mk>
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/evbppc/compile/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbppc/compile/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1.2.2 2003/01/07 21:07:42 thorpej Exp $
+
+.include <bsd.prog.mk>
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/evbppc/conf/Makefile.walnut.inc
--- a/sys/arch/evbppc/conf/Makefile.walnut.inc Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/evbppc/conf/Makefile.walnut.inc Tue Jan 07 21:07:40 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.walnut.inc,v 1.1.2.2 2002/12/11 06:28:58 thorpej Exp $
+# $NetBSD: Makefile.walnut.inc,v 1.1.2.3 2003/01/07 21:07:42 thorpej Exp $
MKIMG?= ${THISPPC}/compile/walnut-mkimg.sh
CFLAGS+=-mcpu=403
@@ -9,7 +9,9 @@
SYSTEM_FIRST_SFILE= ${THISPPC}/walnut/walnut_start.S
.ifdef DBSYM
-SYSTEM_LD_TAIL_EXTRA+=; echo ${DBSYM} $@; ${DBSYM} $@
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo "${DBSYM} $@ || true"; \
+ ${DBSYM} $@ || true
.endif
SYSTEM_LD_TAIL_EXTRA+=; \
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/evbppc/walnut/machdep.c
--- a/sys/arch/evbppc/walnut/machdep.c Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/evbppc/walnut/machdep.c Tue Jan 07 21:07:40 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1.2.3 2002/12/19 18:29:59 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.1.2.4 2003/01/07 21:07:43 thorpej Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -263,14 +263,14 @@
memcpy((void *)(EXC_DTMISS|EXC_ALI), &errata51handler,
(size_t)&errata51size);
break;
+#if defined(DDB) || defined(IPKDB)
case EXC_PGM:
#if defined(DDB)
memcpy((void *)exc, &ddblow, (size_t)&ddbsize);
#elif defined(IPKDB)
memcpy((void *)exc, &ipkdblow, (size_t)&ipkdbsize);
-#else
- memcpy((void *)exc, &pgmtrap, (size_t)&pgmsize);
#endif
+#endif /* DDB | IPKDB */
break;
}
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/evbppc/walnut/walnut_start.S
--- a/sys/arch/evbppc/walnut/walnut_start.S Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/evbppc/walnut/walnut_start.S Tue Jan 07 21:07:40 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: walnut_start.S,v 1.1.2.3 2002/12/19 19:44:56 thorpej Exp $ */
+/* $NetBSD: walnut_start.S,v 1.1.2.4 2003/01/07 21:07:44 thorpej Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -70,7 +70,6 @@
#undef PPC_4XX_NOCACHE
#include "opt_ddb.h"
-#include "fs_kernfs.h"
#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_multiprocessor.h"
@@ -190,7 +189,7 @@
/* compute end of kernel memory */
lis 8,_C_LABEL(end)@ha
addi 8,8,_C_LABEL(end)@l
-#if defined(DDB) || defined(KERNFS)
+#if defined(DDB)
/* If we had symbol table location we'd store it here and would've adjusted r8 here */
lis 7,_C_LABEL(startsym)@ha
addi 7,7,_C_LABEL(startsym)@l
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/evbsh3/Makefile
--- a/sys/arch/evbsh3/Makefile Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/evbsh3/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1999/09/13 10:30:21 itojun Exp $
+# $NetBSD: Makefile,v 1.1.30.1 2003/01/07 21:07:44 thorpej Exp $
# Makefile for evbsh3 tags file and boot blocks
@@ -25,6 +25,6 @@
(cd $$i && rm -f tags; ln -s ../tags tags); done
-SUBDIR= include # stand
+SUBDIR= compile include # stand
.include <bsd.subdir.mk>
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/evbsh3/compile/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbsh3/compile/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1.2.2 2003/01/07 21:07:45 thorpej Exp $
+
+.include <bsd.prog.mk>
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hp300/Makefile
--- a/sys/arch/hp300/Makefile Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/hp300/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/06/12 23:22:35 cgd Exp $
+# $NetBSD: Makefile,v 1.10.32.1 2003/01/07 21:08:36 thorpej Exp $
# Makefile for hp300 tags file and boot blocks
@@ -27,6 +27,6 @@
cd $$i && rm -f tags; ln -s ../tags tags; done
-SUBDIR= include stand
+SUBDIR= compile include stand
.include <bsd.subdir.mk>
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hp300/compile/.keep_me
--- a/sys/arch/hp300/compile/.keep_me Tue Jan 07 21:06:45 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.2 1994/10/26 07:23:03 cgd Exp $
-
-This normally empty directory needs to be kept in the distribution.
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hp300/compile/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hp300/compile/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1.2.2 2003/01/07 21:08:38 thorpej Exp $
+
+.include <bsd.prog.mk>
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hp300/dev/dcmreg.h
--- a/sys/arch/hp300/dev/dcmreg.h Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/hp300/dev/dcmreg.h Tue Jan 07 21:07:40 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dcmreg.h,v 1.5 1996/02/24 00:55:05 thorpej Exp $ */
+/* $NetBSD: dcmreg.h,v 1.5.48.1 2003/01/07 21:08:38 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -143,10 +143,10 @@
#define DCMRS 0x80 /* software reset, write */
/* interrupt control */
-#define DCMIPL(x) ((((x) >> 4) & 3) + 3) /* interupt level, read */
-#define IC_IR 0x40 /* interupt request, read */
-#define IC_IE 0x80 /* interupt enable, write */
-#define IC_ID 0x00 /* interupt disable, write */
+#define DCMIPL(x) ((((x) >> 4) & 3) + 3) /* interrupt level, read */
+#define IC_IR 0x40 /* interrupt request, read */
+#define IC_IE 0x80 /* interrupt enable, write */
+#define IC_ID 0x00 /* interrupt disable, write */
/* Semaphore control */
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hp300/stand/inst/Makefile
--- a/sys/arch/hp300/stand/inst/Makefile Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/hp300/stand/inst/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5.2.2 2002/01/08 00:24:47 nathanw Exp $
+# $NetBSD: Makefile,v 1.5.2.3 2003/01/07 21:08:38 thorpej Exp $
PROGAOUT= inst
PROGSOURCE= inst.c
@@ -16,15 +16,7 @@
rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_INST
ln ${DESTDIR}${BINDIR}/inst.lif ${DESTDIR}${BINDIR}/rbootd/SYS_INST
-.ifndef RELEASEDIR
-release:
- @echo setenv RELEASEDIR first
- @false
-.else
-release: inst.lif
- mkdir -p $(RELEASEDIR)/installation/misc
- rm -f $(RELEASEDIR)/installation/misc/SYS_INST
- ${INSTALL} ${COPY} -m 444 inst.lif \
- $(RELEASEDIR)/installation/misc/SYS_INST
-.endif # RELEASEDIR check
+release: check_RELEASEDIR .WAIT inst.lif
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} inst.lif \
+ ${RELEASEDIR}/${MACHINE}/installation/misc/SYS_INST
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hp300/stand/uboot/Makefile
--- a/sys/arch/hp300/stand/uboot/Makefile Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/hp300/stand/uboot/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5.2.3 2002/02/28 04:09:32 nathanw Exp $
+# $NetBSD: Makefile,v 1.5.2.4 2003/01/07 21:08:39 thorpej Exp $
PROGAOUT= uboot
PROGSOURCE= uboot.c tgets.c
@@ -28,14 +28,6 @@
rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
-.ifndef RELEASEDIR
-release:
- @echo setenv RELEASEDIR first
- @false
-.else
-release: uboot.lif
- mkdir -p ${RELEASEDIR}/installation/misc
- rm -f ${RELEASEDIR}/installation/misc/SYS_UBOOT
- ${INSTALL} ${COPY} -m 444 uboot.lif \
- ${RELEASEDIR}/installation/misc/SYS_UBOOT
-.endif # RELEASEDIR check
+release: check_RELEASEDIR .WAIT uboot.lif
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} uboot.lif \
+ ${RELEASEDIR}/${MACHINE}/installation/misc/SYS_UBOOT
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hpcarm/Makefile
--- a/sys/arch/hpcarm/Makefile Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/hpcarm/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2001/02/23 03:48:06 ichiro Exp $
+# $NetBSD: Makefile,v 1.1.10.1 2003/01/07 21:08:40 thorpej Exp $
# Makefile for hpcarm tags file and boot blocks
@@ -25,6 +25,6 @@
cd $$i && rm -f tags; ln -s ../tags tags; done
-SUBDIR= include
+SUBDIR= compile include
.include <bsd.subdir.mk>
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hpcarm/compile/.keep_me
--- a/sys/arch/hpcarm/compile/.keep_me Tue Jan 07 21:06:45 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2001/02/23 03:48:07 ichiro Exp $
-
-This file must remain so that 'cvs checkout' makes the compile directory.
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hpcarm/compile/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hpcarm/compile/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1.2.2 2003/01/07 21:08:41 thorpej Exp $
+
+.include <bsd.prog.mk>
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hpcarm/dev/j720ssp.c
--- a/sys/arch/hpcarm/dev/j720ssp.c Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/hpcarm/dev/j720ssp.c Tue Jan 07 21:07:40 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: j720ssp.c,v 1.2.8.8 2002/11/11 21:58:37 nathanw Exp $ */
+/* $NetBSD: j720ssp.c,v 1.2.8.9 2003/01/07 21:08:42 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -689,6 +689,7 @@
case WSMOUSEIO_SCALIBCOORDS:
case WSMOUSEIO_GCALIBCOORDS:
+ case WSMOUSEIO_GETID:
return tpcalib_ioctl(&sc->sc_tpcalib, cmd, data, flag, p);
default:
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hpcmips/Makefile
--- a/sys/arch/hpcmips/Makefile Tue Jan 07 21:06:45 2003 +0000
+++ b/sys/arch/hpcmips/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.3 2001/02/23 14:08:55 uch Exp $
+# $NetBSD: Makefile,v 1.3.8.1 2003/01/07 21:08:43 thorpej Exp $
-SUBDIR= include
+SUBDIR= compile include # stand
.include <bsd.kinc.mk>
diff -r 87abd221ed43 -r 99e42f8f09c8 sys/arch/hpcmips/compile/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hpcmips/compile/Makefile Tue Jan 07 21:07:40 2003 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1.2.2 2003/01/07 21:08:44 thorpej Exp $
+
Home |
Main Index |
Thread Index |
Old Index