diff options
Diffstat (limited to 'sys/arch/vax/include')
-rw-r--r-- | sys/arch/vax/include/cpu.h | 6 | ||||
-rw-r--r-- | sys/arch/vax/include/db_machdep.h | 4 | ||||
-rw-r--r-- | sys/arch/vax/include/ka630.h | 5 | ||||
-rw-r--r-- | sys/arch/vax/include/ka650.h | 5 | ||||
-rw-r--r-- | sys/arch/vax/include/param.h | 6 | ||||
-rw-r--r-- | sys/arch/vax/include/pmap.h | 4 | ||||
-rw-r--r-- | sys/arch/vax/include/psl.h | 8 | ||||
-rw-r--r-- | sys/arch/vax/include/rpb.h | 10 | ||||
-rw-r--r-- | sys/arch/vax/include/trap.h | 5 | ||||
-rw-r--r-- | sys/arch/vax/include/vmparam.h | 8 |
10 files changed, 36 insertions, 25 deletions
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h index 510e8d857b3..3639ebf1e4b 100644 --- a/sys/arch/vax/include/cpu.h +++ b/sys/arch/vax/include/cpu.h @@ -1,5 +1,5 @@ -/* $OpenBSD: cpu.h,v 1.7 1997/09/10 11:47:05 maja Exp $ */ -/* $NetBSD: cpu.h,v 1.23 1997/03/15 15:09:41 ragge Exp $ */ +/* $OpenBSD: cpu.h,v 1.8 1997/09/12 09:21:19 maja Exp $ */ +/* $NetBSD: cpu.h,v 1.24 1997/07/26 10:12:40 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden @@ -60,6 +60,8 @@ struct cpu_dep { u_char *cpu_intclr; /* Used on some VAXstations */ u_char *cpu_intmsk; /* Used on some VAXstations */ struct uc_map *cpu_map; /* Map containing important addresses */ + void (*cpu_halt) __P((void)); /* Cpu dependent halt call */ + void (*cpu_reboot) __P((int)); /* Cpu dependent reboot call */ }; extern struct cpu_dep *dep_call; /* Holds pointer to current CPU struct. */ diff --git a/sys/arch/vax/include/db_machdep.h b/sys/arch/vax/include/db_machdep.h index 3058fa98d7a..edce4e8527d 100644 --- a/sys/arch/vax/include/db_machdep.h +++ b/sys/arch/vax/include/db_machdep.h @@ -1,5 +1,5 @@ -/* $OpenBSD: db_machdep.h,v 1.5 1997/09/10 11:47:05 maja Exp $ */ -/* $NetBSD: db_machdep.h,v 1.3 1997/02/06 21:17:05 gwr Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.6 1997/09/12 09:21:19 maja Exp $ */ +/* $NetBSD: db_machdep.h,v 1.4 1997/06/26 01:27:01 thorpej Exp $ */ /* * Mach Operating System diff --git a/sys/arch/vax/include/ka630.h b/sys/arch/vax/include/ka630.h index 11f9e3fbc6c..755376fc8c7 100644 --- a/sys/arch/vax/include/ka630.h +++ b/sys/arch/vax/include/ka630.h @@ -1,5 +1,5 @@ -/* $OpenBSD: ka630.h,v 1.2 1997/05/29 00:04:42 niklas Exp $ */ -/* $NetBSD: ka630.h,v 1.1 1996/07/20 17:58:17 ragge Exp $ */ +/* $OpenBSD: ka630.h,v 1.3 1997/09/12 09:21:20 maja Exp $ */ +/* $NetBSD: ka630.h,v 1.2 1997/07/26 10:12:41 ragge Exp $ */ /*- * Copyright (c) 1986, 1988 The Regents of the University of California. * All rights reserved. @@ -95,6 +95,7 @@ struct uvaxIIcpu { #define KA630CLK_RESTRT 01 #define KA630CLK_REBOOT 02 #define KA630CLK_HALT 03 +#define KA630CLK_DOTHIS 040 /* in progress flags */ #define KA630CLK_BOOT 04 #define KA630CLK_RSTRT 010 diff --git a/sys/arch/vax/include/ka650.h b/sys/arch/vax/include/ka650.h index 8833438dc99..90b5544ff0e 100644 --- a/sys/arch/vax/include/ka650.h +++ b/sys/arch/vax/include/ka650.h @@ -1,5 +1,5 @@ -/* $OpenBSD: ka650.h,v 1.6 1997/09/10 11:47:07 maja Exp $ */ -/* $NetBSD: ka650.h,v 1.5 1997/02/12 17:50:36 ragge Exp $ */ +/* $OpenBSD: ka650.h,v 1.7 1997/09/12 09:21:21 maja Exp $ */ +/* $NetBSD: ka650.h,v 1.6 1997/07/26 10:12:43 ragge Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. * All rights reserved. @@ -196,6 +196,7 @@ struct ka650_ssc { #define CPMB650_HALT 0x03 /* Halt */ #define CPMB650_BIP 0x04 /* Bootstrap in progress */ #define CPMB650_RIP 0x08 /* Restart in progress */ +#define CPMB650_DOTHIS 0x30 /* Execute sommand */ #define CPMB650_LANG 0xf0 /* Language field */ /* diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h index ea2c9f5b78e..086d5830df6 100644 --- a/sys/arch/vax/include/param.h +++ b/sys/arch/vax/include/param.h @@ -1,5 +1,5 @@ -/* $OpenBSD: param.h,v 1.8 1997/09/10 11:47:09 maja Exp $ */ -/* $NetBSD: param.h,v 1.23 1997/02/24 23:23:06 fvdl Exp $ */ +/* $OpenBSD: param.h,v 1.9 1997/09/12 09:21:22 maja Exp $ */ +/* $NetBSD: param.h,v 1.24 1997/08/05 13:28:51 ragge Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -192,11 +192,13 @@ #define vunmapbuf(p,q) #endif +#ifdef _KERNEL /* Prototype needed for delay() */ #ifndef _LOCORE void delay __P((int)); #endif #define DELAY(x) delay(x) +#endif /* _KERNEL */ #endif /* _VAX_PARAM_H_ */ diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h index 8457ecf9265..16daa47f1e4 100644 --- a/sys/arch/vax/include/pmap.h +++ b/sys/arch/vax/include/pmap.h @@ -1,5 +1,5 @@ -/* $OpenBSD: pmap.h,v 1.5 1997/05/29 00:04:46 niklas Exp $ */ -/* $NetBSD: pmap.h,v 1.17 1996/07/20 17:58:22 ragge Exp $ */ +/* $OpenBSD: pmap.h,v 1.6 1997/09/12 09:21:22 maja Exp $ */ +/* $NetBSD: pmap.h,v 1.19 1997/07/06 22:38:29 ragge Exp $ */ /* * Copyright (c) 1987 Carnegie-Mellon University diff --git a/sys/arch/vax/include/psl.h b/sys/arch/vax/include/psl.h index 05c5c42f691..f7c099858d9 100644 --- a/sys/arch/vax/include/psl.h +++ b/sys/arch/vax/include/psl.h @@ -1,5 +1,5 @@ -/* $OpenBSD: psl.h,v 1.3 1997/05/29 00:04:47 niklas Exp $ */ -/* $NetBSD: psl.h,v 1.5 1996/01/28 12:32:21 ragge Exp $ */ +/* $OpenBSD: psl.h,v 1.4 1997/09/12 09:21:23 maja Exp $ */ +/* $NetBSD: psl.h,v 1.6 1997/06/07 12:15:28 ragge Exp $ */ /* * Rewritten for the VAX port. Based on Berkeley code. /IC @@ -87,7 +87,7 @@ #define PSL_S 0x02000000 /* executive mode */ #define PSL_U 0x03000000 /* user mode */ #define PSL_IS 0x04000000 /* interrupt stack select */ -#define PSL_FPD 0x04000000 /* first part done flag */ +#define PSL_FPD 0x08000000 /* first part done flag */ #define PSL_TP 0x40000000 /* trace pending */ #define PSL_CM 0x80000000 /* compatibility mode */ @@ -107,7 +107,7 @@ #define CLKF_USERMODE(framep) ((((framep)->ps) & (PSL_U)) == PSL_U) #define CLKF_BASEPRI(framep) ((((framep)->ps) & (PSL_IPL1F)) == 0) #define CLKF_PC(framep) ((framep)->pc) -#define CLKF_INTR(framep) 0 +#define CLKF_INTR(framep) ((((framep)->ps) & (PSL_IS)) == PSL_IS) #define PSL2IPL(ps) ((ps) >> 16) #endif diff --git a/sys/arch/vax/include/rpb.h b/sys/arch/vax/include/rpb.h index 5edb432914c..d46f8951a90 100644 --- a/sys/arch/vax/include/rpb.h +++ b/sys/arch/vax/include/rpb.h @@ -1,5 +1,5 @@ -/* $OpenBSD: rpb.h,v 1.4 1997/09/10 11:47:09 maja Exp $ */ -/* $NetBSD: rpb.h,v 1.3 1997/03/15 15:09:40 ragge Exp $ */ +/* $OpenBSD: rpb.h,v 1.5 1997/09/12 09:21:24 maja Exp $ */ +/* $NetBSD: rpb.h,v 1.4 1997/06/13 08:24:09 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -111,9 +111,9 @@ struct rpb { /* size description */ #define BDEV_KDB 33 #define BDEV_KRB 34 #define BDEV_NK 35 -#define BDEV_RD 36 -#define BDEV_SCSI 37 -#define BDEV_SFL 42 +#define BDEV_RD 36 /* ST506/MFM disk on HDC9224 */ +#define BDEV_ST 37 /* SCSI tape on NCR5380 */ +#define BDEV_SD 42 /* SCSI disk on NCR5380 */ #define BDEV_CNSL 64 #define BDEV_QE 96 #define BDEV_DE 97 diff --git a/sys/arch/vax/include/trap.h b/sys/arch/vax/include/trap.h index afaa5ceb6eb..860ea3fd6fb 100644 --- a/sys/arch/vax/include/trap.h +++ b/sys/arch/vax/include/trap.h @@ -1,5 +1,5 @@ -/* $OpenBSD: trap.h,v 1.8 1997/09/10 11:47:11 maja Exp $ */ -/* $NetBSD: trap.h,v 1.15 1997/02/16 20:37:29 ragge Exp $ */ +/* $OpenBSD: trap.h,v 1.9 1997/09/12 09:21:25 maja Exp $ */ +/* $NetBSD: trap.h,v 1.16 1997/07/28 21:48:36 ragge Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -50,6 +50,7 @@ #define T_PRIVINFLT 1 /* privileged instruction */ #define T_RESOPFLT 2 /* reserved operand */ #define T_BPTFLT 3 /* breakpoint instruction */ +#define T_XFCFLT 4 /* Customer reserved instruction */ #define T_SYSCALL 5 /* system call (kcall) */ #define T_ARITHFLT 6 /* arithmetic trap */ #define T_ASTFLT 7 /* system forced exception */ diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h index 46993dc18c8..ad2e6b212c6 100644 --- a/sys/arch/vax/include/vmparam.h +++ b/sys/arch/vax/include/vmparam.h @@ -1,5 +1,5 @@ -/* $OpenBSD: vmparam.h,v 1.7 1997/09/10 11:47:12 maja Exp $ */ -/* $NetBSD: vmparam.h,v 1.13 1997/02/12 17:52:59 ragge Exp $ */ +/* $OpenBSD: vmparam.h,v 1.8 1997/09/12 09:21:25 maja Exp $ */ +/* $NetBSD: vmparam.h,v 1.15 1997/07/12 16:20:38 perry Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -136,6 +136,10 @@ * so we loan each swapped in process memory worth 100$, or just admit * that we don't consider it worthwhile and swap it out to disk which costs * $30/mb or about $0.75. + * Update: memory prices have changed recently (9/96). At the current + * value of $6 per megabyte, we lend each swapped in process memory worth + * $0.15, or just admit that we don't consider it worthwhile and swap it out + * to disk which costs $0.20/MB, or just under half a cent. */ #define SAFERSS 8 /* nominal ``small'' resident set size |