diff options
| author | jhb <jhb@FreeBSD.org> | 2003-11-14 19:13:06 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2003-11-14 19:13:06 +0000 |
| commit | 398b81cbfea84290fdcb6c14412904d199728fc7 (patch) | |
| tree | 6121f7f8470a7685d01cd172bebe4877b327734f /sys/i386/isa | |
| parent | d22bcd89c96354b72d81a686f65296b774abb68c (diff) | |
| download | FreeBSD-src-398b81cbfea84290fdcb6c14412904d199728fc7.zip FreeBSD-src-398b81cbfea84290fdcb6c14412904d199728fc7.tar.gz | |
Replace magic numbers with macros for i8259A register constants. Still
need the ICW4 bits for PC98 though.
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/atpic.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/i386/isa/atpic.c b/sys/i386/isa/atpic.c index 0f17af3..8a1aa7c 100644 --- a/sys/i386/isa/atpic.c +++ b/sys/i386/isa/atpic.c @@ -73,14 +73,14 @@ __FBSDID("$FreeBSD$"); #define SLAVE_MODE 9 /* 8086 mode */ #else /* IBM-PC */ #ifdef AUTO_EOI_1 -#define MASTER_MODE (2 | 1) /* Auto EOI, 8086 mode */ +#define MASTER_MODE (ICW4_8086 | ICW4_AEOI) #else -#define MASTER_MODE 1 /* 8086 mode */ +#define MASTER_MODE ICW4_8086 #endif #ifdef AUTO_EOI_2 -#define SLAVE_MODE (2 | 1) /* Auto EOI, 8086 mode */ +#define SLAVE_MODE (ICW4_8086 | ICW4_AEOI) #else -#define SLAVE_MODE 1 /* 8086 mode */ +#define SLAVE_MODE ICW4_8086 #endif #endif /* PC98 */ @@ -263,11 +263,12 @@ i8259_init(struct atpic *pic, int slave) /* Reset the PIC and program with next four bytes. */ mtx_lock_spin(&icu_lock); #ifdef DEV_MCA + /* MCA uses level triggered interrupts. */ if (MCA_system) - outb(pic->at_ioaddr, 0x19); + outb(pic->at_ioaddr, ICW1_RESET | ICW1_IC4 | ICW1_LTIM); else #endif - outb(pic->at_ioaddr, 0x11); + outb(pic->at_ioaddr, ICW1_RESET | ICW1_IC4); imr_addr = pic->at_ioaddr + ICU_IMR_OFFSET; /* Start vector. */ @@ -293,12 +294,12 @@ i8259_init(struct atpic *pic, int slave) outb(imr_addr, *pic->at_imen); /* Reset is finished, default to IRR on read. */ - outb(pic->at_ioaddr, 0x0a); + outb(pic->at_ioaddr, OCW3_SEL | OCW3_RR); #ifndef PC98 - /* Set priority order to 3-7, 0-2 (com2 first). */ + /* OCW2_L1 sets priority order to 3-7, 0-2 (com2 first). */ if (!slave) - outb(pic->at_ioaddr, 0xc0 | (3 - 1)); + outb(pic->at_ioaddr, OCW2_R | OCW2_SL | OCW2_L1); #endif mtx_unlock_spin(&icu_lock); } |
