Add multiple inclusion protection.

This commit is contained in:
matt 2002-12-01 21:21:44 +00:00
parent 4913834e76
commit 56effcf269
14 changed files with 71 additions and 17 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.h,v 1.19 2002/11/15 14:52:56 ragge Exp $ */
/* $NetBSD: bus.h,v 1.20 2002/12/01 21:21:44 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@ -1058,7 +1058,7 @@ struct vax_bus_dmamap {
bus_dma_segment_t dm_segs[1]; /* segments; variable length */
};
#ifdef _VAX_BUS_DMA_PRIVATE
/*#ifdef _VAX_BUS_DMA_PRIVATE */
int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
bus_size_t, int, bus_dmamap_t *));
void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
@ -1087,6 +1087,6 @@ void _bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva,
size_t size));
paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
int nsegs, off_t off, int prot, int flags));
#endif /* _VAX_BUS_DMA_PRIVATE */
/*#endif*/ /* _VAX_BUS_DMA_PRIVATE */
#endif /* _VAX_BUS_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ka410.h,v 1.4 1998/10/06 04:04:31 matt Exp $ */
/* $NetBSD: ka410.h,v 1.5 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -32,6 +32,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _VAX_KA410_H_
#define _VAX_KA410_H_
/*
* Definition for I/O addresses of
*
@ -192,3 +195,5 @@ struct ka410_clock {
u_long :2; u_long csr3 :8; u_long :22;
u_long :2; u_long cpmbx :8; u_long :22;
};
#endif /* _VAX_KA410_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ka420.h,v 1.2 1998/06/07 18:34:09 ragge Exp $ */
/* $NetBSD: ka420.h,v 1.3 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -32,6 +32,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _VAX_KA420_H_
#define _VAX_KA420_H_
/*
* Definitions for I/O addresses of
*
@ -170,3 +173,4 @@
#define KA420_CACR_TPE 0x00000020 /* tag parity error */
#define KA420_CACR_CEN 0x00000010 /* cache enable */
#endif /* _VAX_KA420_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ka43.h,v 1.4 1998/10/06 04:04:31 matt Exp $ */
/* $NetBSD: ka43.h,v 1.5 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -32,6 +32,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _VAX_KA43_H_
#define _VAX_KA43_H_
/*
* Definitions for I/O addresses of
*
@ -244,3 +247,5 @@ struct ka43_clock {
u_long :2; u_long csr3 :8; u_long :22;
u_long :2; u_long cpmbx :8; u_long :22;
};
#endif /* _VAX_KA43_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ka46.h,v 1.2 1998/08/11 17:52:58 ragge Exp $ */
/* $NetBSD: ka46.h,v 1.3 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -34,6 +34,9 @@
* KA46 (VS4000/60) specific definitions.
*/
#ifndef _VAX_KA46_H_
#define _VAX_KA46_H_
/* IPR bits definitions */
#define PCSTS_FLUSH 4
@ -53,3 +56,5 @@
#define KA46_BWF0 0x20080014
#define BWF0_FEN 0x01000000
#endif /* _VAX_KA46_H_ */

View File

@ -33,6 +33,8 @@
* KA48 (VS4000 VLC) specific definitions. *** INCOMPLETE ! MK-990306 ***
*/
#ifndef _VAX_KA48_H_
#define _VAX_KA48_H_
/* IPR bits definitions */
#define PCSTS_FLUSH 4
@ -59,3 +61,5 @@
#define KA48_PARCTL_NPEN 0x00000100 /* ?? Parity Enable */
#define KA48_PARCTL_INVENA 0x01000000 /* Invalid ? Enable */
#define KA48_PARCTL_AGS 0x02000000 /* ??? */
#endif /* _VAX_KA48_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ka650.h,v 1.8 2001/08/31 04:44:56 simonb Exp $ */
/* $NetBSD: ka650.h,v 1.9 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@ -37,6 +37,9 @@
* @(#)ka650.h 7.5 (Berkeley) 6/28/90
*/
#ifndef _VAX_KA650_H_
#define _VAX_KA650_H_
/*
*
* Definitions specific to the ka650 (uVAX 3600/3602) cpu card.
@ -242,3 +245,5 @@ struct ka650_ipcr {
#define GETSYSSUBT(x) ((x >> 8) & 0xff)
#define GETFRMREV(x) ((x >> 16) & 0xff)
#define GETCODREV(x) (x & 0xff)
#endif /* _VAX_KA650_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ka670.h,v 1.2 2000/07/06 17:42:49 ragge Exp $ */
/* $NetBSD: ka670.h,v 1.3 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -37,6 +37,8 @@
*
* VAX 4000/300 (KA670)
*/
#ifndef _VAX_KA670_H_
#define _VAX_KA670_H_
#define KA670_SIDEX 0x20040004 /* SID extension register */
#define KA670_IORESET 0x20020000 /* I/O Reset register */
@ -99,3 +101,4 @@
#define RSSC_OPORT 0x30 /* Offset */
#define RSSC_IPORT 0x40 /* Offset */
#endif /* _VAX_KA670_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ka680.h,v 1.1 2001/02/05 13:20:10 ragge Exp $ */
/* $NetBSD: ka680.h,v 1.2 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -36,6 +36,8 @@
* KA675/680 (VAX4000/[45]00) specific definitions.
*/
#ifndef _VAX_KA680_H_
#define _VAX_KA680_H_
/* IPR bits definitions */
#define PCSTS_FLUSH 4
@ -56,3 +58,4 @@
#define KA680_BWF0 0x20080014
#define BWF0_FEN 0x01000000
#endif /* _VAX_KA680_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ka750.h,v 1.9 1999/08/07 10:36:46 ragge Exp $ */
/* $NetBSD: ka750.h,v 1.10 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@ -30,6 +30,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _VAX_KA750_H_
#define _VAX_KA750_H_
#include <machine/nexus.h>
#define V750UCODE(x) ((x>>8)&255)
@ -41,3 +44,5 @@
/* 11/750 specific pages needed to be stolen when bootstrapping */
#define V750PGS 4
#endif /* _VAX_KA750_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ka820.h,v 1.4 2001/06/03 15:10:34 ragge Exp $ */
/* $NetBSD: ka820.h,v 1.5 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@ -40,6 +40,8 @@
/*
* Definitions specific to the ka820 cpu.
*/
#ifndef _VAX_KA820_H_
#define _VAX_KA820_H_
/*
* Device addresses.
@ -141,4 +143,6 @@ struct ka820clock {
};
void crxintr __P((void *arg));
#endif
#endif /* _LOCORE */
#endif /* _VAX_KA820_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ka88.h,v 1.1 2000/07/26 11:47:20 ragge Exp $ */
/* $NetBSD: ka88.h,v 1.2 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@ -34,6 +34,8 @@
* KA88 system defines, gotten from the
* VAX 8530/8550/8700/8800 System Maintenance Guide.
*/
#ifndef _VAX_KA88_H_
#define _VAX_KA88_H_
/* Console communication ID fields */
#define KA88_CSA1 0x0100 /* first floppy */
@ -127,3 +129,5 @@ struct nmi_attach_args {
#ifdef _KERNEL
int ka88_confdata;
#endif
#endif /* _VAX_KA88_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: reg.h,v 1.3 1995/04/12 15:26:52 ragge Exp $ */
/* $NetBSD: reg.h,v 1.4 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@ -31,7 +31,9 @@
*/
/* All bugs are subject to removal without further notice */
#ifndef _VAX_REG_H_
#define _VAX_REG_H_
struct reg {
int r0; /* General registers saved upon trap/syscall */
@ -53,3 +55,4 @@ struct reg {
int psl; /* User psl */
};
#endif /* _VAX_REG_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: rpb.h,v 1.7 2000/04/18 20:23:54 ragge Exp $ */
/* $NetBSD: rpb.h,v 1.8 2002/12/01 21:21:45 matt Exp $ */
/*
* Copyright (c) 1995 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -31,6 +31,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _VAX_RPB_H_
#define _VAX_RPB_H_
/*
* Look at "VAX/VMS Internals and Data Structures" around page 907
@ -125,3 +127,5 @@ struct rpb { /* size description */
#ifdef _KERNEL
extern struct rpb rpb;
#endif
#endif /* _VAX_RPB_H_ */