Page MenuHomeFreeBSD
Files F106084899

D16827.diff
No OneTemporary
Actions

D16827.diff
View Options

Index: head/sys/x86/isa/atpic.c
===================================================================
--- head/sys/x86/isa/atpic.c
+++ head/sys/x86/isa/atpic.c
@@ -67,12 +67,12 @@
#define MASTER 0
#define SLAVE 1
+#define IMEN_MASK(ai) (IRQ_MASK((ai)->at_irq))
+
#define NUM_ISA_IRQS 16
static void atpic_init(void *dummy);
-unsigned int imen; /* XXX */
-
inthand_t
IDTVEC(atpic_intr0), IDTVEC(atpic_intr1), IDTVEC(atpic_intr2),
IDTVEC(atpic_intr3), IDTVEC(atpic_intr4), IDTVEC(atpic_intr5),
@@ -93,12 +93,24 @@
#define IRQ(ap, ai) ((ap)->at_irqbase + (ai)->at_irq)
-#define ATPIC(io, base, eoi, imenptr) \
- { { atpic_enable_source, atpic_disable_source, (eoi), \
- atpic_enable_intr, atpic_disable_intr, atpic_vector, \
- atpic_source_pending, NULL, atpic_resume, atpic_config_intr,\
- atpic_assign_cpu }, (io), (base), IDT_IO_INTS + (base), \
- (imenptr) }
+#define ATPIC(io, base, eoi) { \
+ .at_pic = { \
+ .pic_enable_source = atpic_enable_source, \
+ .pic_disable_source = atpic_disable_source, \
+ .pic_eoi_source = (eoi), \
+ .pic_enable_intr = atpic_enable_intr, \
+ .pic_disable_intr = atpic_disable_intr, \
+ .pic_vector = atpic_vector, \
+ .pic_source_pending = atpic_source_pending, \
+ .pic_resume = atpic_resume, \
+ .pic_config_intr = atpic_config_intr, \
+ .pic_assign_cpu = atpic_assign_cpu \
+ }, \
+ .at_ioaddr = (io), \
+ .at_irqbase = (base), \
+ .at_intbase = IDT_IO_INTS + (base), \
+ .at_imen = 0xff, \
+ }
#define INTSRC(irq) \
{ { &atpics[(irq) / 8].at_pic }, IDTVEC(atpic_intr ## irq ), \
@@ -109,7 +121,7 @@
int at_ioaddr;
int at_irqbase;
uint8_t at_intbase;
- uint8_t *at_imen;
+ uint8_t at_imen;
};
struct atpic_intsrc {
@@ -136,8 +148,8 @@
static void i8259_init(struct atpic *pic, int slave);
static struct atpic atpics[] = {
- ATPIC(IO_ICU1, 0, atpic_eoi_master, (uint8_t *)&imen),
- ATPIC(IO_ICU2, 8, atpic_eoi_slave, ((uint8_t *)&imen) + 1)
+ ATPIC(IO_ICU1, 0, atpic_eoi_master),
+ ATPIC(IO_ICU2, 8, atpic_eoi_slave)
};
static struct atpic_intsrc atintrs[] = {
@@ -197,9 +209,9 @@
struct atpic *ap = (struct atpic *)isrc->is_pic;
spinlock_enter();
- if (*ap->at_imen & IMEN_MASK(ai)) {
- *ap->at_imen &= ~IMEN_MASK(ai);
- outb(ap->at_ioaddr + ICU_IMR_OFFSET, *ap->at_imen);
+ if (ap->at_imen & IMEN_MASK(ai)) {
+ ap->at_imen &= ~IMEN_MASK(ai);
+ outb(ap->at_ioaddr + ICU_IMR_OFFSET, ap->at_imen);
}
spinlock_exit();
}
@@ -212,8 +224,8 @@
spinlock_enter();
if (ai->at_trigger != INTR_TRIGGER_EDGE) {
- *ap->at_imen |= IMEN_MASK(ai);
- outb(ap->at_ioaddr + ICU_IMR_OFFSET, *ap->at_imen);
+ ap->at_imen |= IMEN_MASK(ai);
+ outb(ap->at_ioaddr + ICU_IMR_OFFSET, ap->at_imen);
}
/*
@@ -387,7 +399,7 @@
outb(imr_addr, MASTER_MODE);
/* Set interrupt enable mask. */
- outb(imr_addr, *pic->at_imen);
+ outb(imr_addr, pic->at_imen);
/* Reset is finished, default to IRR on read. */
outb(pic->at_ioaddr, OCW3_SEL | OCW3_RR);
@@ -406,7 +418,6 @@
int i;
/* Start off with all interrupts disabled. */
- imen = 0xffff;
i8259_init(&atpics[MASTER], 0);
i8259_init(&atpics[SLAVE], 1);
atpic_enable_source((struct intsrc *)&atintrs[ICU_SLAVEID]);
Index: head/sys/x86/isa/icu.h
===================================================================
--- head/sys/x86/isa/icu.h
+++ head/sys/x86/isa/icu.h
@@ -70,7 +70,6 @@
#endif
#define IRQ_MASK(irq) (1 << (irq))
-#define IMEN_MASK(ai) (IRQ_MASK((ai)->at_irq))
void atpic_handle_intr(u_int vector, struct trapframe *frame);
void atpic_startup(void);

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 26, 3:41 AM (12 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15601042
Default Alt Text
D16827.diff (3 KB)

Event Timeline