diff options
Diffstat (limited to 'sys/arch/vax/include/nexus.h')
| -rw-r--r-- | sys/arch/vax/include/nexus.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sys/arch/vax/include/nexus.h b/sys/arch/vax/include/nexus.h index 7c50f1e1fec..9a377317deb 100644 --- a/sys/arch/vax/include/nexus.h +++ b/sys/arch/vax/include/nexus.h @@ -1,5 +1,5 @@ -/* $OpenBSD: nexus.h,v 1.8 2000/04/26 03:08:42 bjc Exp $ */ -/* $NetBSD: nexus.h,v 1.15 1999/08/07 10:36:46 ragge Exp $ */ +/* $OpenBSD: nexus.h,v 1.9 2001/08/25 13:33:36 hugh Exp $ */ +/* $NetBSD: nexus.h,v 1.17 2000/06/04 17:58:19 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -38,6 +38,9 @@ #ifndef _VAX_NEXUS_H_ #define _VAX_NEXUS_H_ + +#include <machine/bus.h> + /* * Different definitions for nicer autoconf probing. */ @@ -97,10 +100,10 @@ struct nexus { }; struct sbi_attach_args { - u_int nexnum; /* This nexus TR number */ - u_int type; /* This nexus type */ - int nexinfo; /* Some info sent between attach & match */ - void *nexaddr; /* Virtual address of this nexus */ + int sa_nexnum; /* This nexus TR number */ + int sa_type; /* This nexus type */ + bus_space_tag_t sa_iot; + bus_space_handle_t sa_ioh; }; /* Memory device struct. This should be somewhere else */ @@ -118,9 +121,6 @@ struct bp_conf { int bp_addr; }; -extern caddr_t *nex_vec; -#define nex_vec_num(ipl, nexnum) nex_vec[(ipl-14)*16+nexnum] - #endif /* @@ -136,7 +136,7 @@ extern caddr_t *nex_vec; #define NEX_CFGFLT (0xfc000000) #ifndef _LOCORE -#if defined(VAX780) || defined(VAX8600) +#if VAX780 || VAX8600 #define NEXFLT_BITS \ "\20\40PARFLT\37WSQFLT\36URDFLT\35ISQFLT\34MXTFLT\33XMTFLT" #endif @@ -182,9 +182,10 @@ extern caddr_t *nex_vec; #define NEX_MEM256I 0x74 /* 256K chips, interleaved */ /* Memory classes */ -#define M780C 0 -#define M780EL 1 -#define M780EU 2 +#define M_NONE 0 +#define M780C 1 +#define M780EL 2 +#define M780EU 3 /* Memory recover defines */ #define MCHK_PANIC -1 |