Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the DECstation stack-traceback pretty-printer, KN01 interrupt handler,

Browse Source 
and IOCTL ASIC dma-buffer-reservation code to use the reorganized am7990
preprocessor tokens and function names.
This commit is contained in:
jonathan 1996-05-19 17:58:12 +00:00
parent 6d5fbdfbe2
commit baa655bc0f
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/mips/mips/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.35 1996/05/19 01:54:49 jonathan Exp $ */
/* $NetBSD: trap.c,v 1.36 1996/05/19 17:58:20 jonathan Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -330,7 +330,7 @@ extern void MachEmptyWriteBuffer __P((void));
extern void MachUTLBMiss __P((void));
extern void setsoftclock __P((void));
extern int main __P((void*));
extern void lememinit __P((void*));
extern void am7990_meminit __P((void*)); /* XXX */
#endif /* DEBUG */
@ -1708,7 +1708,7 @@ static struct { void *addr; char *name;} names[] = {
Name(interrupt),
Name(trap),
#ifdef pmax
Name(lememinit),
Name(am7990_meminit),
#endif
#ifdef CPU_R3000
Name(mips_r2000_KernGenException),

11
sys/arch/pmax/pmax/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.49 1996/05/19 02:03:38 jonathan Exp $ */
/* $NetBSD: machdep.c,v 1.50 1996/05/19 17:58:25 jonathan Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -109,7 +109,7 @@
#include "dc.h"
#include "dtop.h"
#include "scc.h"
#include "le.h"
#include "le_pmax.h"
#include "asc.h"
#include <pmax/dev/sccvar.h>
@ -639,7 +639,7 @@ mach_init(argc, argv, code, cv)
maxmem = physmem;
#if NLE > 0
#if NLE_IOASIC > 0
/*
* Grab 128K at the top of physical memory for the lance chip
* on machines where it does dma through the I/O ASIC.
@ -650,7 +650,7 @@ mach_init(argc, argv, code, cv)
maxmem -= btoc(128 * 1024);
le_iomem = (maxmem << PGSHIFT);
}
#endif /* NLE */
#endif /* NLE_IOASIC */
#if NASC > 0
/*
* Ditto for the scsi chip. There is probably a way to make asc.c
@ -737,6 +737,7 @@ mach_init(argc, argv, code, cv)
* cpu_startup: allocate memory for variable-sized tables,
* initialize cpu, and do autoconfiguration.
*/
void
cpu_startup()
{
register unsigned i;
@ -1081,6 +1082,7 @@ sys_sigreturn(p, v, retval)
int waittime = -1;
void
boot(howto)
register int howto;
{
@ -1128,6 +1130,7 @@ boot(howto)
dumpsys();
(*f)(); /* jump back to prom monitor and do 'auto' cmd */
}
while(1) ; /* fool gcc */
/*NOTREACHED*/
}

19
sys/arch/pmax/pmax/pmax_trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmax_trap.c,v 1.34 1996/04/10 17:38:27 jonathan Exp $ */
/* $NetBSD: pmax_trap.c,v 1.35 1996/05/19 17:58:12 jonathan Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -78,9 +78,18 @@
#include <pmax/stand/dec_prom.h>
#include <sys/socket.h>
#include <sys/mbuf.h>
#include <netinet/in.h>
#include <net/if.h>
#include <netinet/if_ether.h>
struct ifnet; struct arpcom;
#include <dev/ic/am7990var.h> /* Lance interrupt for kn01 */
#include "asc.h"
#include "sii.h"
#include "le.h"
#include "le_pmax.h"
#include "dc.h"
#include <sys/cdefs.h>
@ -208,7 +217,7 @@ kn01_intr(mask, pc, statusReg, causeReg)
}
#endif /* NSII */
#if NLE > 0
#if NLE_PMAX > 0
if (mask & MACH_INT_MASK_1) {
/*
@ -217,10 +226,10 @@ kn01_intr(mask, pc, statusReg, causeReg)
* manipulating if queues should have called splimp(),
* which would mask out MACH_INT_MASK_1.
*/
leintr(le_cd.cd_devs[0]);
am7990_intr(le_cd.cd_devs[0]); /* XXX FIXME */
intrcnt[LANCE_INTR]++;
}
#endif /* NLE */
#endif /* NLE_PMAX */
#if NDC > 0
if (mask & MACH_INT_MASK_2) {

6
sys/arch/pmax/pmax/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.35 1996/05/19 01:54:49 jonathan Exp $ */
/* $NetBSD: trap.c,v 1.36 1996/05/19 17:58:20 jonathan Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -330,7 +330,7 @@ extern void MachEmptyWriteBuffer __P((void));
extern void MachUTLBMiss __P((void));
extern void setsoftclock __P((void));
extern int main __P((void*));
extern void lememinit __P((void*));
extern void am7990_meminit __P((void*)); /* XXX */
#endif /* DEBUG */
@ -1708,7 +1708,7 @@ static struct { void *addr; char *name;} names[] = {
Name(interrupt),
Name(trap),
#ifdef pmax
Name(lememinit),
Name(am7990_meminit),
#endif
#ifdef CPU_R3000
Name(mips_r2000_KernGenException),