diff options
| -rw-r--r-- | core/minute-ia/interrupts.c | 12 | ||||
| -rw-r--r-- | core/minute-ia/interrupts.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/minute-ia/interrupts.c b/core/minute-ia/interrupts.c index a64a9f3aab..2c30a9f017 100644 --- a/core/minute-ia/interrupts.c +++ b/core/minute-ia/interrupts.c @@ -67,12 +67,12 @@ void mask_interrupt(uint32_t irq) /* Maps IRQs to vectors. To be programmed in IOAPIC redirection table */ static const irq_desc_t system_irqs[] = { - LEVEL_INTR(ISH30_I2C0_IRQ, ISH30_I2C0_VEC), - LEVEL_INTR(ISH30_I2C1_IRQ, ISH30_I2C1_VEC), - LEVEL_INTR(ISH30_I2C2_IRQ, ISH30_I2C2_VEC), - LEVEL_INTR(ISH30_IPC_HOST2ISH_IRQ, ISH30_IPC_VEC), - LEVEL_INTR(ISH30_HPET_TIMER0_IRQ, ISH30_HPET_TIMER0_VEC), - LEVEL_INTR(ISH30_HPET_TIMER1_IRQ, ISH30_HPET_TIMER1_VEC), + LEVEL_INTR(ISH_I2C0_IRQ, ISH_I2C0_VEC), + LEVEL_INTR(ISH_I2C1_IRQ, ISH_I2C1_VEC), + LEVEL_INTR(ISH_I2C2_IRQ, ISH_I2C2_VEC), + LEVEL_INTR(ISH_IPC_HOST2ISH_IRQ, ISH_IPC_VEC), + LEVEL_INTR(ISH_HPET_TIMER0_IRQ, ISH_HPET_TIMER0_VEC), + LEVEL_INTR(ISH_HPET_TIMER1_IRQ, ISH_HPET_TIMER1_VEC), }; diff --git a/core/minute-ia/interrupts.h b/core/minute-ia/interrupts.h index 7bc6944fcc..c878a90968 100644 --- a/core/minute-ia/interrupts.h +++ b/core/minute-ia/interrupts.h @@ -48,8 +48,8 @@ typedef struct { /* APIC bit definitions. */ #define APIC_DIV_16 0x03 #define APIC_ENABLE_BIT (1UL << 8UL) -#define APIC_SPURIOUS_INT REG32(LAPIC_BASE + 0xF0UL ) -#define APIC_LVT_ERROR REG32(LAPIC_BASE + 0x370UL) +#define APIC_SPURIOUS_INT REG32(ISH_LAPIC_BASE + 0xF0UL ) +#define APIC_LVT_ERROR REG32(ISH_LAPIC_BASE + 0x370UL) #ifndef __ASSEMBLER__ /* Interrupt descriptor entry */ |