Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej_scsipi]: src/sys Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/55c43914cf21
branches: thorpej_scsipi
changeset: 477483:55c43914cf21
user: bouyer <bouyer%NetBSD.org@localhost>
date: Mon Apr 23 09:41:25 2001 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/alpha/alpha/api_up1000.c | 17 +-
sys/arch/alpha/alpha/cpu.c | 55 +-
sys/arch/alpha/alpha/db_interface.c | 8 +-
sys/arch/alpha/alpha/debug.s | 18 +-
sys/arch/alpha/alpha/dec_1000a.c | 38 +-
sys/arch/alpha/alpha/dec_2000_300.c | 17 +-
sys/arch/alpha/alpha/dec_2100_a50.c | 17 +-
sys/arch/alpha/alpha/dec_2100_a500.c | 17 +-
sys/arch/alpha/alpha/dec_550.c | 17 +-
sys/arch/alpha/alpha/dec_6600.c | 17 +-
sys/arch/alpha/alpha/dec_alphabook1.c | 17 +-
sys/arch/alpha/alpha/dec_axppci_33.c | 17 +-
sys/arch/alpha/alpha/dec_eb164.c | 17 +-
sys/arch/alpha/alpha/dec_eb64plus.c | 17 +-
sys/arch/alpha/alpha/dec_eb66.c | 17 +-
sys/arch/alpha/alpha/dec_kn20aa.c | 17 +-
sys/arch/alpha/alpha/dec_kn300.c | 17 +-
sys/arch/alpha/alpha/fp_complete.c | 1 +
sys/arch/alpha/alpha/ipifuncs.c | 16 +-
sys/arch/alpha/alpha/locore.s | 20 +-
sys/arch/alpha/alpha/machdep.c | 79 +-
sys/arch/alpha/alpha/pmap.c | 149 +-
sys/arch/alpha/alpha/trap.c | 39 +-
sys/arch/alpha/alpha/vm_machdep.c | 5 +-
sys/arch/alpha/conf/files.alpha | 5 +-
sys/arch/alpha/include/cpu.h | 17 +-
sys/arch/alpha/include/db_machdep.h | 5 +-
sys/arch/alpha/include/intr.h | 26 +-
sys/arch/alpha/include/lock.h | 9 +-
sys/arch/alpha/include/pcb.h | 25 +-
sys/arch/alpha/include/pmap.h | 6 +-
sys/arch/alpha/include/sysarch.h | 9 +-
sys/arch/alpha/tlsb/tlsb.c | 7 +-
sys/arch/amiga/amiga/pmap.c | 39 +-
sys/arch/amiga/include/pmap.h | 4 +-
sys/arch/arc/arc/machdep.c | 6 +-
sys/arch/arm/arm32/cpu.c | 463 ++++
sys/arch/arm/arm32/pmap.c | 25 +-
sys/arch/arm/conf/files.arm | 7 +-
sys/arch/arm/include/arm32/pmap.h | 4 +-
sys/arch/arm/include/arm32/psl.h | 5 +-
sys/arch/arm/include/cpu.h | 5 +-
sys/arch/arm/mainbus/cpu.c | 498 ----
sys/arch/arm/mainbus/cpu_mainbus.c | 93 +
sys/arch/arm26/arm26/conf.c | 7 +-
sys/arch/arm26/arm26/irq.c | 8 +-
sys/arch/arm26/arm26/machdep.c | 7 +-
sys/arch/arm26/arm26/pmap.c | 26 +-
sys/arch/arm26/conf/FOURMEG | 3 +-
sys/arch/arm26/conf/GENERIC | 3 +-
sys/arch/arm26/conf/files.arm26 | 18 +-
sys/arch/arm26/ioc/arcpp.c | 335 +++
sys/arch/arm26/ioc/arcppreg.h | 10 +
sys/arch/arm26/ioc/latches.c | 117 +
sys/arch/arm26/ioc/latchreg.h | 47 +-
sys/arch/arm26/ioc/latchvar.h | 38 +
sys/arch/arm26/podulebus/dtide.c | 6 +-
sys/arch/arm26/podulebus/if_eh.c | 6 +-
sys/arch/arm26/podulebus/podulebus.c | 6 +-
sys/arch/arm26/podulebus/podulebus.h | 3 -
sys/arch/arm32/conf/NC_WSCONS | 4 +-
sys/arch/arm32/footbridge/footbridge_pci.c | 14 +-
sys/arch/arm32/iomd/iomd_irq.S | 150 +-
sys/arch/arm32/podulebus/asc.c | 11 +-
sys/arch/arm32/podulebus/ascreg.h | 4 +-
sys/arch/arm32/podulebus/sbic.c | 169 +-
sys/arch/arm32/podulebus/sbicreg.h | 84 +-
sys/arch/arm32/podulebus/sbicvar.h | 5 +-
sys/arch/atari/atari/pmap.c | 35 -
sys/arch/atari/include/pmap.h | 4 +-
sys/arch/cobalt/cobalt/machdep.c | 6 +-
sys/arch/hp300/hp300/disksubr.c | 4 +-
sys/arch/hp300/hp300/pmap.c | 32 +-
sys/arch/hp300/include/pmap.h | 4 +-
sys/arch/hpc/conf/files.hpc | 14 +-
sys/arch/hpc/conf/platid.def | 4 +-
sys/arch/hpc/hpc/platid_gen/platid_gen.c | 17 +-
sys/arch/hpc/hpc/platid_mask.c | 10 +-
sys/arch/hpc/hpc/platid_name.c | 6 +-
sys/arch/hpc/include/platid_generated.h | 415 +++-
sys/arch/hpc/include/platid_mask.h | 10 +-
sys/arch/hpcmips/conf/GENERIC | 21 +-
sys/arch/hpcmips/conf/INSTALL_TX3912 | 15 +
sys/arch/hpcmips/conf/INSTALL_TX3922 | 15 +
sys/arch/hpcmips/conf/RAMDISK | 3 +-
sys/arch/hpcmips/hpcmips/machdep.c | 6 +-
sys/arch/hpcmips/vr/bcu_vrip.c | 48 +-
sys/arch/hpcmips/vr/bcureg.h | 62 +-
sys/arch/hpcmips/vr/vrgiu.c | 4 +-
sys/arch/hpcmips/vr/vripreg.h | 103 +-
sys/arch/hpcsh/dev/hd64461/hd64461uartreg.h | 4 +-
sys/arch/hpcsh/dev/hd64461/hd64461uartvar.h | 4 +-
sys/arch/hpcsh/include/param.h | 176 +
sys/arch/i386/conf/CARDBUS | 6 +-
sys/arch/i386/conf/DELPHI | 6 +-
sys/arch/i386/conf/DR-EVIL | 4 +-
sys/arch/i386/conf/GENERIC | 6 +-
sys/arch/i386/conf/GENERIC_DIAGNOSTIC | 10 +
sys/arch/i386/conf/GENERIC_LAPTOP | 6 +-
sys/arch/i386/conf/GENERIC_TINY | 4 +-
sys/arch/i386/conf/HOMEWORLD | 4 +-
sys/arch/i386/conf/INSTALL | 4 +-
sys/arch/i386/conf/INSTALL_LAPTOP | 4 +-
sys/arch/i386/conf/INSTALL_SMALL | 4 +-
sys/arch/i386/conf/INSTALL_TINY | 4 +-
sys/arch/i386/conf/IOPENER | 6 +-
sys/arch/i386/conf/LAMB | 4 +-
sys/arch/i386/conf/MINBAR | 4 +-
sys/arch/i386/conf/NBFTP | 4 +-
sys/arch/i386/conf/PS2 | 29 +-
sys/arch/i386/conf/SWINGER | 6 +-
sys/arch/i386/conf/files.i386 | 5 +-
sys/arch/i386/i386/machdep.c | 5 +-
sys/arch/i386/i386/pmap.c | 52 +-
sys/arch/i386/include/mca_machdep.h | 8 +-
sys/arch/i386/mca/mca_machdep.c | 27 +-
sys/arch/i386/pci/amd756.c | 260 ++
sys/arch/i386/pci/amd756reg.h | 83 +
sys/arch/i386/pci/pci_intr_fixup.c | 5 +-
sys/arch/i386/pci/pci_intr_fixup.h | 4 +-
sys/arch/i386/pci/pcmb.c | 16 +-
sys/arch/luna68k/include/pmap.h | 4 +-
sys/arch/luna68k/luna68k/pmap.c | 34 +-
sys/arch/mac68k/include/pmap.h | 4 +-
sys/arch/mac68k/mac68k/bus_space.c | 4 +-
sys/arch/mac68k/mac68k/pmap.c | 32 +-
sys/arch/macppc/dev/if_gm.c | 3 +-
sys/arch/mips/include/pmap.h | 4 +-
sys/arch/mips/mips/pmap.c | 64 +-
sys/arch/mipsco/mipsco/machdep.c | 8 +-
sys/arch/mvme68k/include/pmap.h | 4 +-
sys/arch/mvme68k/mvme68k/pmap.c | 41 +-
sys/arch/netwinder/conf/GENERIC | 59 +-
sys/arch/netwinder/conf/files.netwinder | 346 +---
sys/arch/netwinder/conf/std.netwinder | 5 +-
sys/arch/netwinder/netwinder/netwinder_machdep.c | 17 +-
sys/arch/netwinder/netwinder/nwmmu.S | 10 +-
sys/arch/netwinder/pci/pci_machdep.c | 108 +
sys/arch/netwinder/pci/pcib.c | 9 +-
sys/arch/news68k/include/pmap.h | 4 +-
sys/arch/news68k/news68k/locore.s | 6 +-
sys/arch/news68k/news68k/pmap.c | 32 +-
sys/arch/newsmips/newsmips/machdep.c | 8 +-
sys/arch/next68k/include/pmap.h | 4 +-
sys/arch/next68k/next68k/pmap.c | 35 +-
sys/arch/pc532/pc532/machdep.c | 5 +-
sys/arch/pc532/pc532/pmap.c | 33 +-
sys/arch/pc532/pc532/vm_machdep.c | 4 +-
sys/arch/pmax/conf/Makefile.pmax.inc | 5 +-
sys/arch/pmax/pmax/machdep.c | 6 +-
sys/arch/powerpc/include/pmap.h | 3 +-
sys/arch/powerpc/powerpc/pmap.c | 25 +-
sys/arch/sgimips/sgimips/machdep.c | 6 +-
sys/arch/sh3/include/pmap.h | 15 +-
sys/arch/sh3/include/rtcreg.h | 9 +-
sys/arch/sh3/sh3/pmap.c | 40 +-
sys/arch/sh3/sh3/vm_machdep.c | 4 +-
sys/arch/sparc/dev/fd.c | 71 +-
sys/arch/sparc/include/pmap.h | 10 +-
sys/arch/sparc/sparc/pmap.c | 47 +-
sys/arch/sparc64/include/pmap.h | 3 +-
sys/arch/sparc64/sparc64/pmap.c | 42 +-
sys/arch/sun2/compile/.keep_me | 3 +
sys/arch/sun2/include/pmap.h | 4 +-
sys/arch/sun2/sun2/pmap.c | 29 +-
sys/arch/sun3/include/pmap3.h | 4 +-
sys/arch/sun3/include/pmap3x.h | 4 +-
sys/arch/sun3/sun3/pmap.c | 29 +-
sys/arch/sun3/sun3x/pmap.c | 28 +-
sys/arch/vax/include/pmap.h | 4 +-
sys/arch/vax/vax/pmap.c | 50 +-
sys/arch/x68k/include/pmap.h | 4 +-
sys/arch/x68k/x68k/pmap.c | 54 +-
sys/conf/files | 11 +-
sys/dev/DEVNAMES | 6 +-
sys/dev/ic/ncr53c9x.c | 505 ++--
sys/dev/ic/ncr53c9xvar.h | 5 +-
sys/dev/ic/sunscpal.c | 2378 ++++++++++++++++++++++
sys/dev/ic/sunscpalreg.h | 90 +
sys/dev/ic/sunscpalvar.h | 288 ++
sys/dev/mca/TODO | 4 +-
sys/dev/mca/aha_mca.c | 14 +-
sys/dev/mca/com_mca.c | 97 +-
sys/dev/mca/dasd_mca.c | 810 -------
sys/dev/mca/dasdreg.h | 131 -
sys/dev/mca/dasdvar.h | 43 -
sys/dev/mca/ed_mca.c | 171 +-
sys/dev/mca/edc_mca.c | 816 +++++++
sys/dev/mca/edcreg.h | 132 +
sys/dev/mca/edcvar.h | 44 +
sys/dev/mca/edvar.h | 32 +-
sys/dev/mca/files.mca | 18 +-
sys/dev/mca/if_ate_mca.c | 8 +-
sys/dev/mca/if_elmc_mca.c | 16 +-
sys/dev/mca/if_ep_mca.c | 10 +-
sys/dev/mca/if_ne_mca.c | 219 ++
sys/dev/mca/if_tr_mca.c | 15 +-
sys/dev/mca/if_we_mca.c | 5 +-
sys/dev/mca/mcadevs | 12 +-
sys/dev/mca/mcadevs.h | 10 +-
sys/dev/mca/mcadevs_data.h | 9 +-
sys/dev/pci/pcidevs | 4 +-
sys/dev/pci/pcidevs.h | 6 +-
sys/dev/pci/pcidevs_data.h | 8 +-
sys/dev/pci/pciide.c | 287 ++-
sys/dev/pci/pciide_acard_reg.h | 62 +
sys/dev/std/ieee1212reg.h | 5 +-
sys/dev/std/sbp2reg.h | 6 +-
sys/dev/tc/cfb.c | 8 +-
sys/dev/tc/px.c | 5 +-
sys/dev/tc/sfb.c | 8 +-
sys/kern/kern_lock.c | 11 +-
sys/kern/kern_synch.c | 3 +-
sys/netisdn/i4b_ctl.c | 12 +-
sys/netisdn/i4b_i4bdrv.c | 13 +-
sys/netisdn/i4b_tel.c | 13 +-
sys/netisdn/i4b_trace.c | 10 +-
sys/nfs/nfs_node.c | 4 +-
sys/nfs/nfs_subs.c | 13 +-
sys/nfs/nfs_vnops.c | 19 +-
sys/sys/exec_elf.h | 6 +-
sys/uvm/uvm_glue.c | 3 +-
sys/uvm/uvm_page.c | 44 +-
sys/uvm/uvm_pmap.h | 6 +-
224 files changed, 8590 insertions(+), 3841 deletions(-)
diffs (truncated from 19413 to 300 lines):
diff -r 91855429d789 -r 55c43914cf21 sys/arch/alpha/alpha/api_up1000.c
--- a/sys/arch/alpha/alpha/api_up1000.c Mon Apr 23 01:03:34 2001 +0000
+++ b/sys/arch/alpha/alpha/api_up1000.c Mon Apr 23 09:41:25 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: api_up1000.c,v 1.4.6.2 2000/11/20 19:56:19 bouyer Exp $ */
+/* $NetBSD: api_up1000.c,v 1.4.6.3 2001/04/23 09:41:25 bouyer Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.4.6.2 2000/11/20 19:56:19 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.4.6.3 2001/04/23 09:41:25 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,6 +77,15 @@
static void api_up1000_cons_init __P((void));
static void api_up1000_device_register __P((struct device *, void *));
+#ifdef KGDB
+#include <machine/db_machdep.h>
+
+static const char *kgdb_devlist[] = {
+ "com",
+ NULL,
+};
+#endif /* KGDB */
+
void
api_up1000_init()
{
@@ -151,6 +160,10 @@
panic("consinit: unknown console type %ld\n",
ctb->ctb_term_type);
}
+#ifdef KGDB
+ /* Attach the KGDB device. */
+ alpha_kgdb_init(kgdb_devlist, &icp->ic_iot);
+#endif /* KGDB */
}
static void
diff -r 91855429d789 -r 55c43914cf21 sys/arch/alpha/alpha/cpu.c
--- a/sys/arch/alpha/alpha/cpu.c Mon Apr 23 01:03:34 2001 +0000
+++ b/sys/arch/alpha/alpha/cpu.c Mon Apr 23 09:41:25 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.39.2.3 2000/12/08 09:23:20 bouyer Exp $ */
+/* $NetBSD: cpu.c,v 1.39.2.4 2001/04/23 09:41:25 bouyer Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.39.2.3 2000/12/08 09:23:20 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.39.2.4 2001/04/23 09:41:25 bouyer Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -87,6 +87,9 @@
#include <machine/prom.h>
#include <machine/alpha.h>
+struct cpu_info cpu_info_primary;
+struct cpu_info *cpu_info_list = &cpu_info_primary;
+
#if defined(MULTIPROCESSOR)
#include <sys/malloc.h>
#include <sys/kthread.h>
@@ -95,15 +98,13 @@
* Array of CPU info structures. Must be statically-allocated because
* curproc, etc. are used early.
*/
-struct cpu_info cpu_info[ALPHA_MAXPROCS];
+struct cpu_info *cpu_info[ALPHA_MAXPROCS];
/* Bitmask of CPUs currently running and paused. */
__volatile u_long cpus_running;
__volatile u_long cpus_paused;
void cpu_boot_secondary __P((struct cpu_info *));
-#else
-struct cpu_info cpu_info_store;
#endif /* MULTIPROCESSOR */
/*
@@ -289,10 +290,18 @@
return;
}
+ if (ma->ma_slot == hwrpb->rpb_primary_cpu_id) {
+ ci = &cpu_info_primary;
#if defined(MULTIPROCESSOR)
- ci = &cpu_info[ma->ma_slot];
-#else
- ci = &cpu_info_store;
+ cpu_info[ma->ma_slot] = ci;
+#endif
+ }
+#if defined(MULTIPROCESSOR)
+ else {
+ ci = malloc(sizeof(*ci), M_DEVBUF, M_WAITOK);
+ memset(ci, 0, sizeof(*ci));
+ cpu_info[ma->ma_slot] = ci;
+ }
#endif
ci->ci_cpuid = ma->ma_slot;
@@ -368,7 +377,7 @@
* running!
*/
if (ma->ma_slot == hwrpb->rpb_primary_cpu_id) {
- ci->ci_flags |= CPUF_PRIMARY;
+ ci->ci_flags |= CPUF_PRIMARY|CPUF_RUNNING;
atomic_setbits_ulong(&cpus_running, (1UL << ma->ma_slot));
}
@@ -395,8 +404,8 @@
u_long i;
for (i = 0; i < ALPHA_MAXPROCS; i++) {
- ci = &cpu_info[i];
- if (ci->ci_idle_pcb == NULL)
+ ci = cpu_info[i];
+ if (ci == NULL || ci->ci_idle_pcb == NULL)
continue;
if (ci->ci_flags & CPUF_PRIMARY)
continue;
@@ -477,6 +486,12 @@
if (timeout == 0)
printf("%s: processor failed to hatch\n",
ci->ci_softc->sc_dev.dv_xname);
+ else {
+ /* Link it into the list. The primary is already there. */
+ ci->ci_next = cpu_info_list->ci_next;
+ cpu_info_list->ci_next = ci;
+ atomic_setbits_ulong(&ci->ci_flags, CPUF_RUNNING);
+ }
}
void
@@ -494,14 +509,13 @@
void
cpu_pause_resume_all(int pause)
{
- u_long cpu_id, cpu_me = cpu_number();
+ struct cpu_info *ci, *self = curcpu();
+ CPU_INFO_ITERATOR cii;
- for (cpu_id = 0; cpu_id < ALPHA_MAXPROCS; cpu_id++) {
- if ((cpus_running & (1UL << cpu_id)) == 0)
+ for (CPU_INFO_FOREACH(cii, ci)) {
+ if (ci == self)
continue;
- if (cpu_id == cpu_me)
- continue;
- cpu_pause_resume(cpu_id, pause);
+ cpu_pause_resume(ci->ci_cpuid, pause);
}
}
@@ -637,13 +651,10 @@
cpu_debug_dump(void)
{
struct cpu_info *ci;
- int i;
+ CPU_INFO_ITERATOR cii;
db_printf("addr dev id flags ipis curproc fpcurproc\n");
- for (i = 0; i < ALPHA_MAXPROCS; i++) {
- ci = &cpu_info[i];
- if (ci->ci_softc == NULL)
- continue;
+ for (CPU_INFO_FOREACH(cii, ci)) {
db_printf("%p %s %lu %lx %lx %p %p\n",
ci,
ci->ci_softc->sc_dev.dv_xname,
diff -r 91855429d789 -r 55c43914cf21 sys/arch/alpha/alpha/db_interface.c
--- a/sys/arch/alpha/alpha/db_interface.c Mon Apr 23 01:03:34 2001 +0000
+++ b/sys/arch/alpha/alpha/db_interface.c Mon Apr 23 09:41:25 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.8.2.3 2001/02/11 19:08:32 bouyer Exp $ */
+/* $NetBSD: db_interface.c,v 1.8.2.4 2001/04/23 09:41:25 bouyer Exp $ */
/*
* Mach Operating System
@@ -52,7 +52,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.8.2.3 2001/02/11 19:08:32 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.8.2.4 2001/04/23 09:41:25 bouyer Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -284,8 +284,8 @@
return;
}
- ci = &cpu_info[addr];
- if (ci->ci_softc == NULL) {
+ ci = cpu_info[addr];
+ if (ci == NULL) {
db_printf("CPU %ld is not configured\n", addr);
return;
}
diff -r 91855429d789 -r 55c43914cf21 sys/arch/alpha/alpha/debug.s
--- a/sys/arch/alpha/alpha/debug.s Mon Apr 23 01:03:34 2001 +0000
+++ b/sys/arch/alpha/alpha/debug.s Mon Apr 23 09:41:25 2001 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: debug.s,v 1.5.4.1 2000/11/20 19:56:22 bouyer Exp $ */
+/* $NetBSD: debug.s,v 1.5.4.2 2001/04/23 09:41:25 bouyer Exp $ */
/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-__KERNEL_RCSID(6, "$NetBSD: debug.s,v 1.5.4.1 2000/11/20 19:56:22 bouyer Exp $")
+__KERNEL_RCSID(6, "$NetBSD: debug.s,v 1.5.4.2 2001/04/23 09:41:25 bouyer Exp $")
/*
* Debugger glue.
@@ -98,9 +98,17 @@
2: lda sp, debug_stack_top /* sp <- debug_stack_top */
3: /* Dispatch to the debugger - arguments are already in place. */
+#if defined(KGDB)
+ mov a3, a0 /* a0 == entry (trap type) */
+ mov a4, a1 /* a1 == frame pointer */
+ CALL(kgdb_trap)
+ br 9f
+#endif
+#if defined(DDB)
CALL(ddb_trap)
-
- /* Debugger return value in v0; switch back to our previous stack. */
+ br 9f
+#endif
+9: /* Debugger return value in v0; switch back to our previous stack. */
mov s0, sp
#if defined(MULTIPROCESSOR)
diff -r 91855429d789 -r 55c43914cf21 sys/arch/alpha/alpha/dec_1000a.c
--- a/sys/arch/alpha/alpha/dec_1000a.c Mon Apr 23 01:03:34 2001 +0000
+++ b/sys/arch/alpha/alpha/dec_1000a.c Mon Apr 23 09:41:25 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_1000a.c,v 1.5.2.2 2000/11/20 19:56:22 bouyer Exp $ */
+/* $NetBSD: dec_1000a.c,v 1.5.2.3 2001/04/23 09:41:26 bouyer Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.5.2.2 2000/11/20 19:56:22 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.5.2.3 2001/04/23 09:41:26 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,6 +113,15 @@
static void dec_1000a_cons_init __P((void));
static void dec_1000a_device_register __P((struct device *, void *));
+#ifdef KGDB
+#include <machine/db_machdep.h>
+
+static const char *kgdb_devlist[] = {
+ "com",
+ NULL,
+};
+#endif /* KGDB */
+
static const struct alpha_variation_table dec_1000_variations[] = {
{ 0, "AlphaServer 1000" },
{ 0, NULL },
@@ -204,13 +213,22 @@
/* XXX */
(void) pckbc_cnattach(iot, IO_KBD, KBCMDP, PCKBC_KBD_SLOT);
- if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
- CTB_TURBOSLOT_TYPE_ISA)
+ /*
+ * AlphaServer 1000s have a firmware bug whereby the
+ * built-in ISA VGA is reported incorrectly -- ctb_turboslot
+ * is mostly 0.
+ */
+ switch (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot)) {
+ case CTB_TURBOSLOT_TYPE_PCI:
+ pci_display_console(iot, memt, pcichipset,
Home |
Main Index |
Thread Index |
Old Index