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/fc80769924c8
branches: nathanw_sa
changeset: 506651:fc80769924c8
user: thorpej <thorpej%NetBSD.org@localhost>
date: Fri Jan 03 16:38:36 2003 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/acorn26/iobus/iobus.c | 6 +-
sys/arch/acorn26/iobus/ioc.c | 8 +-
sys/arch/acorn26/ioc/iic.c | 6 +-
sys/arch/acorn26/podulebus/podulebus.c | 12 +-
sys/arch/acorn32/acorn32/hydra.c | 8 +-
sys/arch/acorn32/acorn32/rpc_machdep.c | 9 +-
sys/arch/acorn32/include/param.h | 6 +-
sys/arch/acorn32/mainbus/fd.c | 4 +-
sys/arch/acorn32/mainbus/pioc.c | 11 +-
sys/arch/acorn32/podulebus/amps.c | 4 +-
sys/arch/acorn32/podulebus/podulebus.c | 11 +-
sys/arch/acorn32/stand/boot32/boot32.c | 64 +++++---
sys/arch/acorn32/stand/boot32/version | 3 +-
sys/arch/algor/dev/bonito_mainbus.c | 6 +-
sys/arch/algor/dev/mainbus.c | 6 +-
sys/arch/algor/dev/vtpbc_mainbus.c | 6 +-
sys/arch/algor/pci/pcib.c | 6 +-
sys/arch/alpha/alpha/mainbus.c | 6 +-
sys/arch/alpha/jensenio/jensenio.c | 8 +-
sys/arch/alpha/mcbus/mcbus.c | 7 +-
sys/arch/alpha/pci/a12c.c | 10 +-
sys/arch/alpha/pci/apecs.c | 8 +-
sys/arch/alpha/pci/cia.c | 8 +-
sys/arch/alpha/pci/dwlpx.c | 8 +-
sys/arch/alpha/pci/irongate.c | 8 +-
sys/arch/alpha/pci/lca.c | 8 +-
sys/arch/alpha/pci/mcpcia.c | 8 +-
sys/arch/alpha/pci/sio.c | 6 +-
sys/arch/alpha/pci/tsc.c | 10 +-
sys/arch/alpha/pci/ttwoga.c | 12 +-
sys/arch/alpha/sableio/sableio.c | 8 +-
sys/arch/alpha/tc/tcasic.c | 6 +-
sys/arch/alpha/tlsb/gbus.c | 8 +-
sys/arch/alpha/tlsb/kftxx.c | 8 +-
sys/arch/alpha/tlsb/tlsb.c | 10 +-
sys/arch/amiga/amiga/autoconf.c | 6 +-
sys/arch/amiga/dev/aster.c | 6 +-
sys/arch/amiga/dev/drsupio.c | 6 +-
sys/arch/amiga/dev/fd.c | 6 +-
sys/arch/amiga/dev/grf.c | 6 +-
sys/arch/amiga/dev/grf_cc.c | 6 +-
sys/arch/amiga/dev/grf_cl.c | 6 +-
sys/arch/amiga/dev/grf_cv.c | 6 +-
sys/arch/amiga/dev/grf_cv3d.c | 6 +-
sys/arch/amiga/dev/grf_et.c | 6 +-
sys/arch/amiga/dev/grf_rh.c | 6 +-
sys/arch/amiga/dev/grf_rt.c | 6 +-
sys/arch/amiga/dev/grf_ul.c | 6 +-
sys/arch/amiga/dev/gvpbus.c | 8 +-
sys/arch/amiga/dev/gvpio.c | 6 +-
sys/arch/amiga/dev/hyper.c | 6 +-
sys/arch/amiga/dev/ioblix_zbus.c | 6 +-
sys/arch/amiga/dev/zbus.c | 11 +-
sys/arch/arc/isa/isabus.c | 6 +-
sys/arch/arc/jazz/fd.c | 4 +-
sys/arch/arc/jazz/jazzio.c | 8 +-
sys/arch/arc/pci/necpb.c | 6 +-
sys/arch/arm/arm32/irq_dispatch.S | 181 +++++++++++++++++++++++++
sys/arch/arm/conf/Makefile.arm | 4 +-
sys/arch/arm/conf/files.arm | 4 +-
sys/arch/arm/conf/files.footbridge | 4 +-
sys/arch/arm/conf/majors.arm32 | 4 +-
sys/arch/arm/footbridge/footbridge.c | 6 +-
sys/arch/arm/footbridge/footbridge_intr.h | 4 +-
sys/arch/arm/footbridge/footbridge_irq.S | 153 ---------------------
sys/arch/arm/iomd/iic.c | 4 +-
sys/arch/arm/ixp12x0/files.ixp12x0 | 25 +++
sys/arch/arm/ixp12x0/ixp12x0.c | 6 +-
sys/arch/arm/ixp12x0/ixp12x0_intr.h | 52 +++++++
sys/arch/arm/ixp12x0/ixp12x0_irq.S | 154 ---------------------
sys/arch/arm/ixp12x0/ixpsip.c | 8 +-
sys/arch/arm/mainbus/mainbus.c | 10 +-
sys/arch/arm/s3c2xx0/files.s3c2xx0 | 4 +-
sys/arch/arm/s3c2xx0/s3c24x0_intr.h | 52 +++++++
sys/arch/arm/s3c2xx0/s3c2800.c | 10 +-
sys/arch/arm/s3c2xx0/s3c2800_clk.c | 3 +-
sys/arch/arm/s3c2xx0/s3c2800_intr.c | 8 +-
sys/arch/arm/s3c2xx0/s3c2800_intr.h | 54 +++++++
sys/arch/arm/s3c2xx0/s3c2800_pci.c | 6 +-
sys/arch/arm/s3c2xx0/s3c2xx0_intr.c | 3 +-
sys/arch/arm/s3c2xx0/s3c2xx0_intr.h | 20 +--
sys/arch/arm/s3c2xx0/s3c2xx0_irq.S | 158 ---------------------
sys/arch/arm/sa11x0/sa11x0.c | 14 +-
sys/arch/arm/xscale/files.i80321 | 4 +-
sys/arch/arm/xscale/files.pxa2x0 | 4 +-
sys/arch/arm/xscale/i80200_irq.S | 11 +-
sys/arch/arm/xscale/i80312.c | 6 +-
sys/arch/arm/xscale/i80321.c | 9 +-
sys/arch/arm/xscale/i80321_intr.h | 8 +-
sys/arch/arm/xscale/i80321_irq.S | 154 ---------------------
sys/arch/arm/xscale/i80321reg.h | 5 +-
sys/arch/arm/xscale/pxa2x0.c | 10 +-
sys/arch/arm/xscale/pxa2x0_intr.c | 7 +-
sys/arch/arm/xscale/pxa2x0_intr.h | 8 +-
sys/arch/arm/xscale/pxa2x0_irq.S | 116 ----------------
sys/arch/atari/atari/autoconf.c | 4 +-
sys/arch/atari/dev/fd.c | 4 +-
sys/arch/atari/dev/hdfd.c | 4 +-
sys/arch/atari/dev/ite_cc.c | 4 +-
sys/arch/atari/dev/ite_et.c | 4 +-
sys/arch/atari/vme/vme.c | 12 +-
sys/arch/bebox/bebox/mainbus.c | 6 +-
sys/arch/bebox/pci/pcib.c | 4 +-
sys/arch/cats/conf/Makefile.cats.inc | 4 +-
sys/arch/cats/conf/std.cats | 4 +-
sys/arch/cats/include/param.h | 6 +-
sys/arch/cats/pci/pcib.c | 4 +-
sys/arch/cesfic/dev/zs.c | 6 +-
sys/arch/cobalt/cobalt/mainbus.c | 6 +-
sys/arch/dreamcast/dev/g2/gapspci.c | 6 +-
sys/arch/dreamcast/dev/maple/maple.c | 8 +-
sys/arch/evbarm/conf/Makefile.evbarm.inc | 104 +-------------
sys/arch/evbarm/conf/ldscript.integrator | 77 ----------
sys/arch/evbarm/conf/ldscript.iq80310 | 77 ----------
sys/arch/evbarm/conf/ldscript.iq80321 | 77 ----------
sys/arch/evbarm/conf/ldscript.ixm1200 | 77 ----------
sys/arch/evbarm/conf/mk.g4250ebx | 16 ++
sys/arch/evbarm/conf/mk.integrator | 17 ++
sys/arch/evbarm/conf/mk.iq80310 | 16 ++
sys/arch/evbarm/conf/mk.iq80321 | 16 ++
sys/arch/evbarm/conf/mk.ixm1200 | 9 +
sys/arch/evbarm/conf/mk.lubbock | 16 ++
sys/arch/evbarm/conf/mk.smdk2xx0 | 16 ++
sys/arch/evbarm/conf/std.integrator | 5 +-
sys/arch/evbarm/conf/std.iq80310 | 5 +-
sys/arch/evbarm/conf/std.iq80321 | 5 +-
sys/arch/evbarm/conf/std.ixm1200 | 7 +-
sys/arch/evbarm/conf/std.lubbock | 5 +-
sys/arch/evbarm/conf/std.smdk2800 | 5 +-
sys/arch/evbarm/ifpga/ifpga.c | 10 +-
sys/arch/evbarm/ifpga/ifpga_irq.S | 15 +-
sys/arch/evbarm/include/cpu.h | 16 +--
sys/arch/evbarm/include/intr.h | 33 +---
sys/arch/evbarm/iq80310/obio.c | 6 +-
sys/arch/evbarm/iq80321/obio.c | 6 +-
sys/arch/evbarm/iq80321/obio_space.c | 53 ++++++-
sys/arch/evbmips/alchemy/pb1000_obio.c | 6 +-
sys/arch/evbmips/conf/majors.evbmips | 4 +-
sys/arch/evbmips/malta/dev/mainbus.c | 6 +-
sys/arch/evbmips/malta/pci/pcib.c | 4 +-
sys/arch/evbppc/conf/majors.evbppc | 4 +-
sys/arch/evbppc/walnut/dev/pbus.c | 6 +-
sys/arch/hp300/dev/dio.c | 9 +-
sys/arch/hp300/dev/frodo.c | 8 +-
sys/arch/hp300/dev/grf.c | 6 +-
sys/arch/hp300/dev/grf_subr.c | 6 +-
sys/arch/hp300/dev/hpib.c | 8 +-
sys/arch/hp300/dev/intio.c | 10 +-
sys/arch/hp300/dev/scsi.c | 15 +-
sys/arch/hpcmips/conf/majors.hpcmips | 3 +-
sys/arch/hpcmips/dev/apm/apmdev.c | 4 +-
sys/arch/hpcmips/dev/it8368.c | 4 +-
sys/arch/hpcmips/dev/plumpcmcia.c | 4 +-
sys/arch/hpcmips/tx/tx39sib.c | 4 +-
sys/arch/hpcmips/tx/tx39uart.c | 4 +-
sys/arch/hpcmips/tx/txcsbus.c | 14 +-
sys/arch/hpcmips/vr/vrc4172pci.c | 6 +-
sys/arch/hpcmips/vr/vrc4173bcu.c | 12 +-
sys/arch/hpcmips/vr/vrip.c | 11 +-
sys/arch/hpcmips/vr/vrpciu.c | 6 +-
sys/arch/hpcsh/dev/hd64461/hd64461.c | 4 +-
sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c | 4 +-
sys/arch/hpcsh/dev/hd64465/hd64465.c | 5 +-
sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c | 4 +-
sys/arch/i386/bios/vesabios.c | 4 +-
sys/arch/i386/conf/GENERIC | 5 +-
sys/arch/i386/conf/GENERIC_LAPTOP | 5 +-
sys/arch/i386/i386/mainbus.c | 8 +-
sys/arch/i386/i386/mpbios.c | 4 +-
sys/arch/i386/pci/pceb.c | 6 +-
sys/arch/i386/pci/pchb.c | 10 +-
sys/arch/i386/pci/pcib.c | 6 +-
sys/arch/i386/pci/pcmb.c | 6 +-
sys/arch/i386/pci/piix.c | 14 +-
sys/arch/i386/pnpbios/pnpbios.c | 12 +-
sys/arch/luna68k/dev/sio.c | 8 +-
sys/arch/luna68k/luna68k/mainbus.c | 6 +-
sys/arch/mac68k/dev/adb.c | 28 ++-
sys/arch/mac68k/dev/grf_subr.c | 4 +-
sys/arch/mac68k/dev/zs.c | 6 +-
sys/arch/mac68k/nubus/nubus.c | 18 +-
sys/arch/mac68k/obio/iwm_fd.c | 4 +-
sys/arch/mac68k/obio/obio.c | 4 +-
sys/arch/macppc/conf/majors.macppc | 4 +-
sys/arch/macppc/dev/adb.c | 28 ++-
sys/arch/macppc/dev/gpio.c | 6 +-
sys/arch/macppc/dev/mediabay.c | 4 +-
sys/arch/macppc/dev/obio.c | 6 +-
sys/arch/macppc/dev/zs.c | 6 +-
sys/arch/macppc/macppc/mainbus.c | 6 +-
sys/arch/macppc/pci/bandit.c | 6 +-
sys/arch/macppc/pci/grackle.c | 6 +-
sys/arch/macppc/pci/uninorth.c | 6 +-
sys/arch/mips/alchemy/aubus.c | 10 +-
sys/arch/mips/sibyte/dev/sbgbus.c | 10 +-
sys/arch/mips/sibyte/dev/sbobio.c | 8 +-
sys/arch/mips/sibyte/dev/sbscd.c | 8 +-
sys/arch/mips/sibyte/dev/sbsmbus.c | 6 +-
sys/arch/mipsco/obio/obio.c | 4 +-
sys/arch/mipsco/obio/zs.c | 6 +-
sys/arch/mmeye/dev/mmeyepcmcia.c | 4 +-
sys/arch/mvme68k/dev/mainbus.c | 6 +-
sys/arch/mvme68k/dev/pcc.c | 8 +-
sys/arch/mvme68k/dev/zs.c | 6 +-
sys/arch/mvmeppc/mvmeppc/mainbus.c | 6 +-
sys/arch/mvmeppc/pci/pcib.c | 4 +-
sys/arch/netwinder/conf/Makefile.netwinder.inc | 4 +-
sys/arch/netwinder/conf/std.netwinder | 4 +-
sys/arch/netwinder/pci/pcib.c | 4 +-
sys/arch/news68k/dev/hb.c | 8 +-
sys/arch/news68k/dev/kbc.c | 4 +-
sys/arch/news68k/dev/zs.c | 6 +-
sys/arch/news68k/news68k/mainbus.c | 4 +-
sys/arch/newsmips/apbus/apbus.c | 4 +-
sys/arch/newsmips/dev/hb.c | 4 +-
sys/arch/newsmips/dev/zs.c | 6 +-
sys/arch/next68k/dev/intio.c | 6 +-
sys/arch/next68k/dev/zs.c | 6 +-
sys/arch/ofppc/firepower/firepower.c | 6 +-
sys/arch/ofppc/ofppc/mainbus.c | 6 +-
sys/arch/playstation2/dev/spd.c | 4 +-
sys/arch/pmax/ibus/ibus.c | 8 +-
222 files changed, 1239 insertions(+), 1878 deletions(-)
diffs (truncated from 6928 to 300 lines):
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn26/iobus/iobus.c
--- a/sys/arch/acorn26/iobus/iobus.c Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn26/iobus/iobus.c Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iobus.c,v 1.2.8.2 2002/10/18 02:33:27 nathanw Exp $ */
+/* $NetBSD: iobus.c,v 1.2.8.3 2003/01/03 16:38:36 thorpej Exp $ */
/*-
* Copyright (c) 1998 Ben Harris
* All rights reserved.
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__RCSID("$NetBSD: iobus.c,v 1.2.8.2 2002/10/18 02:33:27 nathanw Exp $");
+__RCSID("$NetBSD: iobus.c,v 1.2.8.3 2003/01/03 16:38:36 thorpej Exp $");
#include <sys/device.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@
struct iobus_attach_args *ioa = aux;
if (ioa->ioa_base != IOBUSCF_BASE_DEFAULT)
- printf(" base 0x%06x",
+ aprint_normal(" base 0x%06x",
ioa->ioa_base - (bus_addr_t)MEMC_IO_BASE);
return UNCONF;
}
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn26/iobus/ioc.c
--- a/sys/arch/acorn26/iobus/ioc.c Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn26/iobus/ioc.c Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ioc.c,v 1.2.8.2 2002/10/18 02:33:27 nathanw Exp $ */
+/* $NetBSD: ioc.c,v 1.2.8.3 2003/01/03 16:38:36 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
@@ -32,7 +32,7 @@
#include <sys/param.h>
-__RCSID("$NetBSD: ioc.c,v 1.2.8.2 2002/10/18 02:33:27 nathanw Exp $");
+__RCSID("$NetBSD: ioc.c,v 1.2.8.3 2003/01/03 16:38:36 thorpej Exp $");
#include <sys/device.h>
#include <sys/kernel.h>
@@ -163,9 +163,9 @@
struct ioc_attach_args *ioc = aux;
if (ioc->ioc_bank != IOCCF_BANK_DEFAULT)
- printf(" bank %d", ioc->ioc_bank);
+ aprint_normal(" bank %d", ioc->ioc_bank);
if (ioc->ioc_offset != IOCCF_OFFSET_DEFAULT)
- printf(" offset 0x%02x", ioc->ioc_offset);
+ aprint_normal(" offset 0x%02x", ioc->ioc_offset);
return UNCONF;
}
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn26/ioc/iic.c
--- a/sys/arch/acorn26/ioc/iic.c Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn26/ioc/iic.c Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iic.c,v 1.1.8.2 2002/10/18 02:33:29 nathanw Exp $ */
+/* $NetBSD: iic.c,v 1.1.8.3 2003/01/03 16:38:36 thorpej Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -47,7 +47,7 @@
#include <sys/param.h>
-__RCSID("$NetBSD: iic.c,v 1.1.8.2 2002/10/18 02:33:29 nathanw Exp $");
+__RCSID("$NetBSD: iic.c,v 1.1.8.3 2003/01/03 16:38:36 thorpej Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -308,7 +308,7 @@
if (!name) {
if (iba->ib_addr)
- printf(" addr 0x%02x", iba->ib_addr);
+ aprint_normal(" addr 0x%02x", iba->ib_addr);
}
/* XXXX print flags */
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn26/podulebus/podulebus.c
--- a/sys/arch/acorn26/podulebus/podulebus.c Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn26/podulebus/podulebus.c Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.3.4.2 2002/10/18 02:33:30 nathanw Exp $ */
+/* $NetBSD: podulebus.c,v 1.3.4.3 2003/01/03 16:38:37 thorpej Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@@ -29,7 +29,7 @@
#include <sys/param.h>
-__RCSID("$NetBSD: podulebus.c,v 1.3.4.2 2002/10/18 02:33:30 nathanw Exp $");
+__RCSID("$NetBSD: podulebus.c,v 1.3.4.3 2003/01/03 16:38:37 thorpej Exp $");
#include <sys/device.h>
#include <sys/malloc.h>
@@ -333,13 +333,13 @@
if (*p >= 32 && *p < 126)
*q++ = *p;
*q++ = 0;
- printf("%s", pa->pa_descr);
+ aprint_normal("%s", pa->pa_descr);
} else
- printf("podule");
- printf(" <%04x:%04x> at %s",
+ aprint_normal("podule");
+ aprint_normal(" <%04x:%04x> at %s",
pa->pa_manufacturer, pa->pa_product, pnp);
}
- printf(" slot %d", pa->pa_slotnum);
+ aprint_normal(" slot %d", pa->pa_slotnum);
return UNCONF;
}
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn32/acorn32/hydra.c
--- a/sys/arch/acorn32/acorn32/hydra.c Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn32/acorn32/hydra.c Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hydra.c,v 1.13.2.2 2002/10/18 02:33:32 nathanw Exp $ */
+/* $NetBSD: hydra.c,v 1.13.2.3 2003/01/03 16:38:37 thorpej Exp $ */
/*-
* Copyright (c) 2002 Ben Harris
@@ -29,7 +29,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: hydra.c,v 1.13.2.2 2002/10/18 02:33:32 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hydra.c,v 1.13.2.3 2003/01/03 16:38:37 thorpej Exp $");
#include <sys/device.h>
#include <sys/systm.h>
@@ -239,8 +239,8 @@
struct hydra_attach_args *ha = aux;
if (pnp)
- printf("cpu at %s", pnp);
- printf(" slave %d", ha->ha_slave);
+ aprint_normal("cpu at %s", pnp);
+ aprint_normal(" slave %d", ha->ha_slave);
return UNCONF;
}
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn32/acorn32/rpc_machdep.c
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.4.2.13 2002/12/29 19:15:01 thorpej Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.4.2.14 2003/01/03 16:38:37 thorpej Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.4.2.13 2002/12/29 19:15:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.4.2.14 2003/01/03 16:38:37 thorpej Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -510,7 +510,7 @@
printf("Allocating page tables\n");
#endif
/*
- * Set up the variables that define the availablilty of physcial
+ * Set up the variables that define the availablilty of physical
* memory
*/
physical_start = 0xffffffff;
@@ -566,6 +566,7 @@
kerneldatasize = bootconfig.kernsize + bootconfig.MDFsize;
/* Update the address of the first free page of physical memory */
+ /* XXX Assumption that the kernel and stuff is at the LOWEST physical memory address? XXX */
physical_freestart +=
bootconfig.kernsize + bootconfig.MDFsize + bootconfig.scratchsize;
free_pages -= (physical_freestart - physical_start) / NBPG;
@@ -684,7 +685,7 @@
#endif
/* Now we fill in the L2 pagetable for the kernel code/data */
-
+ /* XXX Kernel doesn't have to be on physical_start (!) use bootconfig XXX */
/*
* The defines are a workaround for a recent problem that occurred
* with ARM 610 processors and some ARM 710 processors
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn32/include/param.h
--- a/sys/arch/acorn32/include/param.h Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn32/include/param.h Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.2.2.3 2002/02/28 04:05:55 nathanw Exp $ */
+/* $NetBSD: param.h,v 1.2.2.4 2003/01/03 16:38:37 thorpej Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -41,10 +41,6 @@
#define _MACHINE acorn32
#define MACHINE "acorn32"
-#ifndef __ELF__
-#define _MACHINE_ARCH arm32
-#define MACHINE_ARCH "arm32"
-#endif /* ! __ELF__ */
#include <arm/arm32/param.h>
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.1.4.8 2002/11/11 21:55:52 nathanw Exp $ */
+/* $NetBSD: fd.c,v 1.1.4.9 2003/01/03 16:38:38 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -369,7 +369,7 @@
register struct fdc_attach_args *fa = aux;
if (!fdc)
- printf(" drive %d", fa->fa_drive);
+ aprint_normal(" drive %d", fa->fa_drive);
return QUIET;
}
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn32/mainbus/pioc.c
--- a/sys/arch/acorn32/mainbus/pioc.c Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn32/mainbus/pioc.c Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pioc.c,v 1.1.4.2 2002/10/18 02:33:40 nathanw Exp $ */
+/* $NetBSD: pioc.c,v 1.1.4.3 2003/01/03 16:38:38 thorpej Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -193,13 +193,14 @@
if (!name) {
if (pa->pa_offset)
- printf(" offset 0x%x", pa->pa_offset >> 2);
+ aprint_normal(" offset 0x%x", pa->pa_offset >> 2);
if (pa->pa_iosize > 1)
- printf("-0x%x", ((pa->pa_offset >> 2) + pa->pa_iosize) - 1);
+ aprint_normal("-0x%x",
+ ((pa->pa_offset >> 2) + pa->pa_iosize) - 1);
if (pa->pa_irq != -1)
- printf(" irq %d", pa->pa_irq);
+ aprint_normal(" irq %d", pa->pa_irq);
if (pa->pa_drq != -1)
- printf(" drq 0x%08x", pa->pa_drq);
+ aprint_normal(" drq 0x%08x", pa->pa_drq);
}
/* XXX print flags */
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn32/podulebus/amps.c
--- a/sys/arch/acorn32/podulebus/amps.c Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn32/podulebus/amps.c Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amps.c,v 1.1.4.4 2002/10/18 02:33:41 nathanw Exp $ */
+/* $NetBSD: amps.c,v 1.1.4.5 2003/01/03 16:38:38 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
struct amps_attach_args *aa = aux;
if (!name)
- printf(", port %d", aa->aa_port);
+ aprint_normal(", port %d", aa->aa_port);
return(QUIET);
}
diff -r 5a3207c3a855 -r fc80769924c8 sys/arch/acorn32/podulebus/podulebus.c
--- a/sys/arch/acorn32/podulebus/podulebus.c Thu Jan 02 21:32:11 2003 +0000
+++ b/sys/arch/acorn32/podulebus/podulebus.c Fri Jan 03 16:38:36 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.1.4.7 2002/10/18 02:33:44 nathanw Exp $ */
+/* $NetBSD: podulebus.c,v 1.1.4.8 2003/01/03 16:38:38 thorpej Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -43,7 +43,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.1.4.7 2002/10/18 02:33:44 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.1.4.8 2003/01/03 16:38:38 thorpej Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -111,11 +111,12 @@
struct podule_attach_args *pa = aux;
if (name)
- printf("podule at %s", name);
Home |
Main Index |
Thread Index |
Old Index