diff options
| author | Steve Murphree <smurph@cvs.openbsd.org> | 1999-09-27 20:30:33 +0000 |
|---|---|---|
| committer | Steve Murphree <smurph@cvs.openbsd.org> | 1999-09-27 20:30:33 +0000 |
| commit | 4fb4310cdabdf5a1054be0bd3f5a793c5198bbc6 (patch) | |
| tree | 596725b5dc4ad25bbc2cac7001379d0b1d73dfe5 /sys/arch/mvme68k/dev | |
| parent | 43fce7b667be075e444ebd5979a58091cd97166c (diff) | |
This gets us to 2.6...
Diffstat (limited to 'sys/arch/mvme68k/dev')
| -rw-r--r-- | sys/arch/mvme68k/dev/bug.c | 16 | ||||
| -rw-r--r-- | sys/arch/mvme68k/dev/vme.h | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/sys/arch/mvme68k/dev/bug.c b/sys/arch/mvme68k/dev/bug.c index c463bf3a0a8..340ee115917 100644 --- a/sys/arch/mvme68k/dev/bug.c +++ b/sys/arch/mvme68k/dev/bug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bug.c,v 1.3 1996/04/28 11:03:18 deraadt Exp $ */ +/* $OpenBSD: bug.c,v 1.4 1999/09/27 20:30:31 smurph Exp $ */ /* * Copyright (c) 1995 Dale Rahn. @@ -45,7 +45,7 @@ char bug_inchr() { int s = splhigh(); - char a; + volatile char a; promcall = 1; asm volatile ("subql #2,sp"); @@ -62,7 +62,7 @@ int bug_instat() { int s = splhigh(); - short ret; + volatile short ret; promcall = 1; MVMEPROM_CALL(MVMEPROM_INSTAT); @@ -126,7 +126,7 @@ int bug_diskrd(arg) bug_dskio *arg; { - int ret; + volatile int ret; promcall = 1; bug_drdcnt++; @@ -137,13 +137,14 @@ bug_diskrd(arg) promcall = 0; return (!(ret & 0x4)); } + /* returns 0: success, nonzero: error */ u_int bug_dwrcnt = 0; int bug_diskwr(arg) bug_dskio *arg; { - int ret; + volatile int ret; promcall = 1; bug_dwrcnt ++; @@ -246,3 +247,8 @@ asm_bug_stat() asm volatile ("movl _asm_callbuf+8,d0"); asm volatile ("movl _asm_callbuf+12,d1"); } + + + + + diff --git a/sys/arch/mvme68k/dev/vme.h b/sys/arch/mvme68k/dev/vme.h index 94a84ff714c..32cdaa4aa45 100644 --- a/sys/arch/mvme68k/dev/vme.h +++ b/sys/arch/mvme68k/dev/vme.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.h,v 1.5 1996/12/11 21:04:14 deraadt Exp $ */ +/* $OpenBSD: vme.h,v 1.6 1999/09/27 20:30:31 smurph Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -226,6 +226,10 @@ struct vme2reg { /*58*/ volatile u_long vme2_t2cmp; /*5c*/ volatile u_long vme2_t2count; /*60*/ volatile u_long vme2_tctl; +#define VME2_TCTL_CEN 0x01 +#define VME2_TCTL_COC 0x02 +#define VME2_TCTL_COVF 0x04 +#define VME2_TCTL_OVF 0xf0 #define VME2_TCTL_SCON 0x40000000 /* we are SCON */ #define VME2_TCTL_SYSFAIL 0x20000000 /* light SYSFAIL led */ #define VME2_TCTL_SRST 0x00800000 /* system reset */ |