diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-05-03 09:10:29 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-05-03 09:10:29 +0000 |
| commit | 595cbd2e050401adf0cab2bab6ce52f902dfbb54 (patch) | |
| tree | 8474c159022572bb93d15b7f2c287d1044321bc1 /sys/arch/vax/include/nexus.h | |
| parent | 3472e7ae763d3e453e57b218243b6d60ece25b43 (diff) | |
sync w/ 0430
Diffstat (limited to 'sys/arch/vax/include/nexus.h')
| -rw-r--r-- | sys/arch/vax/include/nexus.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/sys/arch/vax/include/nexus.h b/sys/arch/vax/include/nexus.h index 7f65fcae77d..60343f3df2c 100644 --- a/sys/arch/vax/include/nexus.h +++ b/sys/arch/vax/include/nexus.h @@ -1,4 +1,4 @@ -/* $NetBSD: nexus.h,v 1.6 1995/12/13 18:55:27 ragge Exp $ */ +/* $NetBSD: nexus.h,v 1.10 1996/03/02 14:27:53 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -75,9 +75,9 @@ #define MAXNNEXUS NNEXSBI #endif -#ifndef ASSEMBLER +#ifndef _LOCORE -#include "sys/types.h" +#include <sys/types.h> struct nexus { union nexcsr { @@ -94,6 +94,14 @@ struct sbi_attach_args { void *nexaddr; /* Virtual address of this nexus */ }; +/* Memory device struct. This should be somewhere else */ +struct mem_softc { + struct device sc_dev; + caddr_t sc_memaddr; + int sc_memtype; + int sc_memnr; +}; + struct iobus { int io_type; int io_addr; @@ -173,7 +181,16 @@ extern caddr_t *nex_vec; #define NEX_MEM256UI 0x73 /* 256K chips, ext-interleaved, upper */ #define NEX_MEM256I 0x74 /* 256K chips, interleaved */ -#ifndef ASSEMBLER +/* Memory classes */ +#define M780C 0 +#define M780EL 1 +#define M780EU 2 + +/* Memory recover defines */ +#define MCHK_PANIC -1 +#define MCHK_RECOVERED 0 + +#ifndef _LOCORE struct nexus *nexus; #endif |