summaryrefslogtreecommitdiff
path: root/sys/arch/i386/include/i8259.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/include/i8259.h')
-rw-r--r--sys/arch/i386/include/i8259.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/i386/include/i8259.h b/sys/arch/i386/include/i8259.h
index 06ffdd1a3e5..e9c887bf7bf 100644
--- a/sys/arch/i386/include/i8259.h
+++ b/sys/arch/i386/include/i8259.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: i8259.h,v 1.3 2006/04/14 21:52:47 weingart Exp $ */
+/* $OpenBSD: i8259.h,v 1.4 2006/04/14 22:26:46 weingart Exp $ */
/* $NetBSD: i8259.h,v 1.3 2003/05/04 22:01:56 fvdl Exp $ */
/*-
@@ -116,24 +116,24 @@ extern void i8259_reinit(void);
#define i8259_asm_ack2(num)
#endif
-#ifndef PIC_MASKDELAY
-#define PIC_MASKDELAY pushl %eax ; inb $0x84,%al ; popl %eax
-#endif
-
#ifdef ICU_HARDWARE_MASK
#define i8259_asm_mask(num) \
movb CVAROFF(imen, IRQ_BYTE(num)),%al ;\
orb $IRQ_BIT(num),%al ;\
movb %al,CVAROFF(imen, IRQ_BYTE(num)) ;\
- PIC_MASKDELAY ;\
+ pushl %eax ;\
+ inb $0x84,%al ;\
+ popl %eax ;\
outb %al,$(ICUADDR+1)
#define i8259_asm_unmask(num) \
cli ;\
movb CVAROFF(imen, IRQ_BYTE(num)),%al ;\
andb $~IRQ_BIT(num),%al ;\
movb %al,CVAROFF(imen, IRQ_BYTE(num)) ;\
- PIC_MASKDELAY ;\
+ pushl %eax ;\
+ inb $0x84,%al ;\
+ popl %eax ;\
outb %al,$(ICUADDR+1) ;\
sti