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

Added earlier forgotten MACHINE_ARCH, pointed out by Arne Henrik Juul. 

Cleaned up a bit.
This commit is contained in:
ragge 1995-12-04 22:32:53 +00:00
parent c6813ecb89
commit 31f199d4e6
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/arch/vax/include/param.h
View File

@ -1,11 +1,9 @@
/* $NetBSD: param.h,v 1.12 1995/08/13 00:45:21 mycroft Exp $ */ /* $NetBSD: param.h,v 1.13 1995/12/04 22:32:53 ragge Exp $ */
/*- /*-
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* *
* Modified for VAX 940213/Ragge
*
* This code is derived from software contributed to Berkeley by * This code is derived from software contributed to Berkeley by
* William Jolitz. * William Jolitz.
* *
@ -44,15 +42,15 @@
#define _VAX_PARAM_H_ #define _VAX_PARAM_H_
#include "machine/macros.h" #include "machine/macros.h"
#include "psl.h" #include "machine/psl.h"
/* /*
* Machine dependent constants for VAX. * Machine dependent constants for VAX.
*/ */
#define MACHINE "vax" #define MACHINE "vax"
#define MACHINE_ARCH "vax"
#define MID_MACHINE MID_VAX #define MID_MACHINE MID_VAX
#define UNIX "vmunix"
/* /*
* Round p (pointer or byte index) up to a correctly-aligned value * Round p (pointer or byte index) up to a correctly-aligned value
@ -132,6 +130,7 @@
/* clicks to bytes */ /* clicks to bytes */
#define ctob(x) ((x) << PGSHIFT) #define ctob(x) ((x) << PGSHIFT)
#define btoc(x) (((x) + PGOFSET) >> PGSHIFT) #define btoc(x) (((x) + PGOFSET) >> PGSHIFT)
#define btop(x) (((unsigned)(x)) >> PGSHIFT)
/* bytes to disk blocks */ /* bytes to disk blocks */
#define btodb(x) ((x) >> DEV_BSHIFT) #define btodb(x) ((x) >> DEV_BSHIFT)
@ -146,19 +145,6 @@
#define bdbtofsb(bn) ((bn) / (BLKDEV_IOSIZE/DEV_BSIZE)) #define bdbtofsb(bn) ((bn) / (BLKDEV_IOSIZE/DEV_BSIZE))
/*
* Mach derived conversion macros
*/
#define vax_round_pdr(x) ((((unsigned)(x)) + NBPDR - 1) & ~(NBPDR-1))
#define vax_trunc_pdr(x) ((unsigned)(x) & ~(NBPDR-1))
#define vax_round_page(x) ((((unsigned)(x)) + NBPG - 1) & ~(NBPG-1))
#define vax_trunc_page(x) ((unsigned)(x) & ~(NBPG-1))
#define vax_btod(x) ((unsigned)(x) >> PDRSHIFT)
#define vax_dtob(x) ((unsigned)(x) << PDRSHIFT)
#define vax_btop(x) ((unsigned)(x) >> PGSHIFT)
#define vax_ptob(x) ((unsigned)(x) << PGSHIFT)
#define splx(reg) \ #define splx(reg) \
({ \ ({ \
register int val; \ register int val; \
@ -187,9 +173,6 @@
#define vmapbuf(p,q) #define vmapbuf(p,q)
#define vunmapbuf(p,q) #define vunmapbuf(p,q)
#if !defined(VAX630) && !defined(VAX410) #define DELAY(x) delay(x)
#define todr() mfpr(PR_TODR)
#endif
#define DELAY(x) {int N=todr()+(x/1000)+1;while(todr()!=N);}
#endif /* _VAX_PARAM_H_ */ #endif /* _VAX_PARAM_H_ */