diff options
author | briggs <briggs@cvs.openbsd.org> | 1997-01-24 01:35:55 +0000 |
---|---|---|
committer | briggs <briggs@cvs.openbsd.org> | 1997-01-24 01:35:55 +0000 |
commit | 2cf4fbaafa89ff9455907432816daebe394b533b (patch) | |
tree | 14fe32451db6302b379b04d7ca3df0c07d26dce7 /sys/arch/mac68k/include/cpu.h | |
parent | 2ebc04f559b55bc6705d62e51a00406bee8ef115 (diff) |
Sync w/ NETBSD_CURRENT_971122.
Diffstat (limited to 'sys/arch/mac68k/include/cpu.h')
-rw-r--r-- | sys/arch/mac68k/include/cpu.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h index d29efa99efa..bf16662a8f3 100644 --- a/sys/arch/mac68k/include/cpu.h +++ b/sys/arch/mac68k/include/cpu.h @@ -1,5 +1,5 @@ -/* $OpenBSD: cpu.h,v 1.12 1996/10/28 14:34:06 briggs Exp $ */ -/* $NetBSD: cpu.h,v 1.43 1996/10/15 14:42:49 scottr Exp $ */ +/* $OpenBSD: cpu.h,v 1.13 1997/01/24 01:35:40 briggs Exp $ */ +/* $NetBSD: cpu.h,v 1.44 1997/01/20 05:08:00 scottr Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -135,16 +135,20 @@ int want_resched; /* resched() was called */ /* * simulated software interrupt register */ -extern unsigned char ssir; - -#define SIR_NET 0x1 -#define SIR_CLOCK 0x2 -#define SIR_SERIAL 0x4 - -#define siroff(x) ssir &= ~(x) -#define setsoftnet() ssir |= SIR_NET -#define setsoftclock() ssir |= SIR_CLOCK -#define setsoftserial() ssir |= SIR_SERIAL +extern volatile u_int8_t ssir; + +#define SIR_NET 0x01 +#define SIR_CLOCK 0x02 +#define SIR_SERIAL 0x04 + +#define siroff(mask) \ + __asm __volatile ( "andb %0,_ssir" : : "ir" (~(mask))); +#define setsoftnet() \ + __asm __volatile ( "orb %0,_ssir" : : "i" (SIR_NET)) +#define setsoftclock() \ + __asm __volatile ( "orb %0,_ssir" : : "i" (SIR_CLOCK)) +#define setsoftserial() \ + __asm __volatile ( "orb %0,_ssir" : : "i" (SIR_SERIAL)) #define CPU_CONSDEV 1 #define CPU_MAXID 2 |