diff options
| author | dg <dg@FreeBSD.org> | 1994-09-16 13:33:56 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1994-09-16 13:33:56 +0000 |
| commit | f40d319a8685d1524f17f2e46cffef6bf9763224 (patch) | |
| tree | 54f2e11922d9e64f624a46a9dfeb32d8581fdeea /sys/i386/isa/icu.h | |
| parent | cd1fdc31d4a5f75289c02b5a64cab1bbd4b53c0b (diff) | |
| download | FreeBSD-src-f40d319a8685d1524f17f2e46cffef6bf9763224.zip FreeBSD-src-f40d319a8685d1524f17f2e46cffef6bf9763224.tar.gz | |
Removed inclusion of pio.h and cpufunc.h (cpufunc.h is included from
systm.h). Merged functionality of pio.h into cpufunc.h. Cleaned up some
related code.
Diffstat (limited to 'sys/i386/isa/icu.h')
| -rw-r--r-- | sys/i386/isa/icu.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h index 13216b0..22c9066 100644 --- a/sys/i386/isa/icu.h +++ b/sys/i386/isa/icu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $Id: icu.h,v 1.2 1993/10/16 13:45:51 rgrimes Exp $ + * $Id: icu.h,v 1.3 1994/04/02 07:00:40 davidg Exp $ */ /* @@ -52,17 +52,17 @@ */ extern unsigned imen; /* interrupt mask enable */ -#define INTREN(s) (imen &= ~(s), SET_ICUS()) -#define INTRDIS(s) (imen |= (s), SET_ICUS()) +#define INTREN(s) {imen &= ~(s); SET_ICUS()} +#define INTRDIS(s) {imen |= (s); SET_ICUS()} #define INTRMASK(msk,s) (msk |= (s)) #if 0 -#define SET_ICUS() (outb(IO_ICU1 + 1, imen), outb(IU_ICU2 + 1, imen >> 8)) +#define SET_ICUS() {outb(IO_ICU1 + 1, imen); outb(IU_ICU2 + 1, imen >> 8);} #else /* * XXX - IO_ICU* are defined in isa.h, not icu.h, and nothing much bothers to * include isa.h, while too many things include icu.h. */ -#define SET_ICUS() (outb(0x21, imen), outb(0xa1, imen >> 8)) +#define SET_ICUS() {outb(0x21, imen); outb(0xa1, imen >> 8);} #endif #endif |
