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/649cdd187b2a
branches: nathanw_sa
changeset: 506697:649cdd187b2a
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue Jan 07 20:56:13 2003 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/amiga/Makefile | 4 +-
sys/arch/amiga/amiga/amiga_init.c | 6 +-
sys/arch/amiga/amiga/autoconf.c | 5 +-
sys/arch/amiga/amiga/cc.c | 10 +-
sys/arch/amiga/amiga/disksubr.c | 6 +-
sys/arch/amiga/amiga/machdep.c | 10 +-
sys/arch/amiga/compile/.keep_me | 3 -
sys/arch/amiga/compile/Makefile | 3 +
sys/arch/amiga/dev/com_supio.c | 6 +-
sys/arch/amiga/dev/fd.c | 6 +-
sys/arch/amiga/dev/grf_ul.c | 6 +-
sys/arch/amiga/dev/gvpio.c | 6 +-
sys/arch/amiga/dev/if_ed.c | 6 +-
sys/arch/amiga/dev/ioblix_zbus.c | 6 +-
sys/arch/amiga/dev/isic_supio.c | 6 +-
sys/arch/amiga/dev/kbd.c | 6 +-
sys/arch/amiga/dev/toccata.c | 16 +-
sys/arch/arc/Makefile | 4 +-
sys/arch/arc/compile/.keep_me | 1 -
sys/arch/arc/compile/Makefile | 3 +
sys/arch/arc/conf/GENERIC | 5 +-
sys/arch/arm/arm32/cpu.c | 6 +-
sys/arch/arm/arm32/exception.S | 4 +-
sys/arch/arm/iomd/rtc.c | 6 +-
sys/arch/atari/Makefile | 4 +-
sys/arch/atari/atari/disksubr.c | 668 ++++++++++++++++++++++++++++++++++
sys/arch/atari/compile/.keep_me | 3 -
sys/arch/atari/compile/Makefile | 3 +
sys/arch/bebox/Makefile | 4 +-
sys/arch/bebox/compile/Makefile | 3 +
sys/arch/cats/Makefile | 29 +
sys/arch/cats/compile/Makefile | 3 +
sys/arch/cesfic/Makefile | 5 +
sys/arch/cesfic/compile/Makefile | 3 +
sys/arch/cobalt/Makefile | 4 +-
sys/arch/cobalt/compile/.keep_me | 3 -
sys/arch/cobalt/compile/Makefile | 3 +
sys/arch/dreamcast/Makefile | 4 +-
sys/arch/dreamcast/compile/Makefile | 3 +
sys/arch/dreamcast/dev/g2/if_mbe_g2.c | 22 +-
sys/arch/evbarm/Makefile | 31 +
sys/arch/evbarm/compile/Makefile | 3 +
sys/arch/evbmips/Makefile | 33 +
sys/arch/evbmips/compile/Makefile | 3 +
44 files changed, 881 insertions(+), 93 deletions(-)
diffs (truncated from 1561 to 300 lines):
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/Makefile
--- a/sys/arch/amiga/Makefile Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/Makefile Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/06/12 23:22:32 cgd Exp $
+# $NetBSD: Makefile,v 1.15.32.1 2003/01/07 20:56:13 thorpej Exp $
# Makefile for amiga 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 bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/amiga/amiga_init.c
--- a/sys/arch/amiga/amiga/amiga_init.c Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/amiga/amiga_init.c Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amiga_init.c,v 1.74.8.4 2002/12/11 05:51:58 thorpej Exp $ */
+/* $NetBSD: amiga_init.c,v 1.74.8.5 2003/01/07 20:56:14 thorpej Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -35,7 +35,7 @@
#include "opt_p5ppc68kboard.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amiga_init.c,v 1.74.8.4 2002/12/11 05:51:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amiga_init.c,v 1.74.8.5 2003/01/07 20:56:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -945,7 +945,7 @@
*(volatile int *)proc0paddr = i;
/*
- * disable all interupts but enable allow them to be enabled
+ * disable all interrupts but enable allow them to be enabled
* by specific driver code (global int enable bit)
*/
#ifdef DRACO
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/amiga/autoconf.c
--- a/sys/arch/amiga/amiga/autoconf.c Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/amiga/autoconf.c Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.78.8.8 2003/01/03 16:38:42 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.78.8.9 2003/01/07 20:56:15 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.78.8.8 2003/01/03 16:38:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.78.8.9 2003/01/07 20:56:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -176,6 +176,7 @@
pdp = &temp;
pdp->dv_cfdata = pcfp;
+ pdp->dv_cfdriver = config_cfdriver_lookup(pcfp->cf_name);
if ((cf = config_search((cfmatch_t)NULL, pdp, auxp)) != NULL) {
ca = config_cfattach_lookup(cf->cf_name, cf->cf_atname);
if (ca != NULL) {
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/amiga/cc.c
--- a/sys/arch/amiga/amiga/cc.c Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/amiga/cc.c Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cc.c,v 1.12.30.2 2002/06/20 03:37:48 nathanw Exp $ */
+/* $NetBSD: cc.c,v 1.12.30.3 2003/01/07 20:56:15 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.12.30.2 2002/06/20 03:37:48 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.12.30.3 2003/01/07 20:56:15 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -342,7 +342,7 @@
int i;
/*
- * disable all audio interupts
+ * disable all audio interrupts
*/
custom.intena = INTF_AUD0|INTF_AUD1|INTF_AUD2|INTF_AUD3;
@@ -375,7 +375,7 @@
audio_dma &= (DMAF_AUD0|DMAF_AUD1|DMAF_AUD2|DMAF_AUD3);
/*
- * disable all audio interupts with DMA set
+ * disable all audio interrupts with DMA set
*/
custom.intena = (audio_dma << INTB_AUD0) & AUCC_ALLINTF;
@@ -425,7 +425,7 @@
out:
/*
- * enable audio interupts with dma still set.
+ * enable audio interrupts with dma still set.
*/
audio_dma = custom.dmaconr;
audio_dma &= (DMAF_AUD0|DMAF_AUD1|DMAF_AUD2|DMAF_AUD3);
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/amiga/disksubr.c
--- a/sys/arch/amiga/amiga/disksubr.c Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/amiga/disksubr.c Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.37.8.3 2002/04/01 07:38:52 nathanw Exp $ */
+/* $NetBSD: disksubr.c,v 1.37.8.4 2003/01/07 20:56:16 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.37.8.3 2002/04/01 07:38:52 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.37.8.4 2003/01/07 20:56:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@
* block numbers, it changes from DEV_BSIZE units to physical units:
* blkno = bp->b_blkno / (lp->d_secsize / DEV_BSIZE);
* As long as media with sector sizes of 512 bytes are used, this
- * doesn't matter (divide by 1), but for successfull usage of media with
+ * doesn't matter (divide by 1), but for successful usage of media with
* greater sector sizes (e.g. 640MB MO-media with 2048 bytes/sector)
* we must multiply block numbers with (lp->d_secsize / DEV_BSIZE)
* to keep "unchanged" physical block numbers.
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/amiga/machdep.c
--- a/sys/arch/amiga/amiga/machdep.c Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/amiga/machdep.c Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.165.2.15 2002/11/11 21:56:08 nathanw Exp $ */
+/* $NetBSD: machdep.c,v 1.165.2.16 2003/01/07 20:56:16 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -46,7 +46,7 @@
#include "opt_compat_netbsd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.165.2.15 2002/11/11 21:56:08 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.165.2.16 2003/01/07 20:56:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1101,10 +1101,10 @@
void *hook;
{
/*
- * XXX currently, there is a memory leak here; we cant free the
+ * XXX currently, there is a memory leak here; we can't free the
* sicallback structure.
- * this will be automatically repaired once we rewirte the soft
- * interupt functions.
+ * this will be automatically repaired once we rewrite the soft
+ * interrupt functions.
*/
free(hook, M_TEMP);
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/compile/.keep_me
--- a/sys/arch/amiga/compile/.keep_me Tue Jan 07 20:44:53 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 02:02:20 cgd Exp $
-
-This normally empty directory needs to be kept in the distribution.
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/compile/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amiga/compile/Makefile Tue Jan 07 20:56:13 2003 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1.2.2 2003/01/07 20:56:18 thorpej Exp $
+
+.include <bsd.prog.mk>
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/dev/com_supio.c
--- a/sys/arch/amiga/dev/com_supio.c Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/dev/com_supio.c Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: com_supio.c,v 1.13.20.2 2002/10/18 02:34:49 nathanw Exp $ */
+/* $NetBSD: com_supio.c,v 1.13.20.3 2003/01/07 20:56:18 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_supio.c,v 1.13.20.2 2002/10/18 02:34:49 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_supio.c,v 1.13.20.3 2003/01/07 20:56:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,7 @@
com_attach_subr(csc);
- /* XXX this should be really in the interupt stuff */
+ /* XXX this should be really in the interrupt stuff */
needpsl = PSL_S | (supa->supio_ipl << 8);
if (amiga_serialspl < needpsl) {
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/dev/fd.c
--- a/sys/arch/amiga/dev/fd.c Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/dev/fd.c Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.48.4.7 2003/01/03 16:38:43 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.48.4.8 2003/01/07 20:56:19 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.48.4.7 2003/01/03 16:38:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.48.4.8 2003/01/07 20:56:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -905,7 +905,7 @@
if ((error = biowait(bp)) != 0)
goto done;
/*
- * copy disklabel to buf and write it out syncronous
+ * copy disklabel to buf and write it out synchronous
*/
dlp = (struct disklabel *)(bp->b_data + LABELOFFSET);
bcopy(lp, dlp, sizeof(struct disklabel));
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/dev/grf_ul.c
--- a/sys/arch/amiga/dev/grf_ul.c Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/dev/grf_ul.c Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_ul.c,v 1.28.26.5 2003/01/03 16:38:45 thorpej Exp $ */
+/* $NetBSD: grf_ul.c,v 1.28.26.6 2003/01/07 20:56:20 thorpej Exp $ */
#define UL_DEBUG
/*-
@@ -40,7 +40,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.28.26.5 2003/01/03 16:38:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.28.26.6 2003/01/07 20:56:20 thorpej Exp $");
#include "grful.h"
#if NGRFUL > 0
@@ -968,7 +968,7 @@
while (next == new_put) {
/*
* we should use an intr. here. unfortunately, we already
- * are called from an interupt and can't use tsleep.
+ * are called from an interrupt and can't use tsleep.
* so we do busy waiting, at least for the moment.
*/
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/dev/gvpio.c
--- a/sys/arch/amiga/dev/gvpio.c Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/dev/gvpio.c Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gvpio.c,v 1.6.8.4 2003/01/03 16:38:46 thorpej Exp $ */
+/* $NetBSD: gvpio.c,v 1.6.8.5 2003/01/07 20:56:20 thorpej Exp $ */
/*
* Copyright (c) 1997 Ignatios Souvatzis
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.6.8.4 2003/01/03 16:38:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.6.8.5 2003/01/07 20:56:20 thorpej Exp $");
/*
* GVP I/O Extender
@@ -140,7 +140,7 @@
++giosd;
}
if (giosc->sc_comhdls.lh_first) {
- /* XXX this should be really in the interupt stuff */
+ /* XXX this should be really in the interrupt stuff */
needpsl = PSL_S|PSL_IPL6;
if (amiga_serialspl < needpsl) {
printf("%s: raising amiga_serialspl from 0x%x to 0x%x\n",
diff -r bfe63830c5e8 -r 649cdd187b2a sys/arch/amiga/dev/if_ed.c
--- a/sys/arch/amiga/dev/if_ed.c Tue Jan 07 20:44:53 2003 +0000
+++ b/sys/arch/amiga/dev/if_ed.c Tue Jan 07 20:56:13 2003 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index