diff options
Diffstat (limited to 'sys/arch/vax/include/nexus.h')
| -rw-r--r-- | sys/arch/vax/include/nexus.h | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/sys/arch/vax/include/nexus.h b/sys/arch/vax/include/nexus.h index 191b950ba7d..7c50f1e1fec 100644 --- a/sys/arch/vax/include/nexus.h +++ b/sys/arch/vax/include/nexus.h @@ -1,5 +1,5 @@ -/* $OpenBSD: nexus.h,v 1.7 1997/05/29 00:04:45 niklas Exp $ */ -/* $NetBSD: nexus.h,v 1.12 1996/08/20 14:19:43 ragge Exp $ */ +/* $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 $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -41,14 +41,17 @@ /* * Different definitions for nicer autoconf probing. */ -#define VAX_SBIBUS 1 /* SBI parent; 780/790 */ -#define VAX_CPUBUS 2 /* Has backplane CPU */ -#define VAX_MEMBUS 4 /* Has backplane memory */ -#define VAX_UNIBUS 8 /* Directly attached (630/650) */ -#define VAX_VSBUS 16 /* VAXstation board */ -#define VAX_BIBUS 32 /* BI bus expansions: 8200/8800 */ -#define VAX_CMIBUS 64 /* CMI backplane (750) */ - +enum bustypes { + VAX_SBIBUS, /* SBI parent (780) */ + VAX_CMIBUS, /* CMI backplane (750) */ + VAX_UNIBUS, /* Direct backplane (730) */ + VAX_ABUS, /* SBI placeholder (8600) */ + VAX_BIBUS, /* BI bus (8200) */ + VAX_NBIBUS, /* NBI backplane (8800) */ + VAX_VSBUS, /* Virtual vaxstation bus */ + VAX_IBUS, /* Internal Microvax bus */ + VAX_XMIBUS, /* XMI master bus (6000) */ +}; /* * Information about nexus's. * @@ -83,9 +86,7 @@ #define MAXNNEXUS NNEXSBI #endif -#ifndef _LOCORE - -#include <sys/types.h> +#ifdef _KERNEL struct nexus { union nexcsr { @@ -189,8 +190,4 @@ extern caddr_t *nex_vec; #define MCHK_PANIC -1 #define MCHK_RECOVERED 0 -#ifndef _LOCORE -struct nexus *nexus; -#endif - #endif /* _VAX_NEXUS_H_ */ |