From e42c20b41a698ceb51f90afb25f1062b333b1913 Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Thu, 17 Jan 2008 21:04:16 +0000 Subject: Give ECC controller an IRQ (Robert Reif) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3923 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/eccmemctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'hw/eccmemctl.c') diff --git a/hw/eccmemctl.c b/hw/eccmemctl.c index a63a52822..02b2f8de3 100755 --- a/hw/eccmemctl.c +++ b/hw/eccmemctl.c @@ -68,7 +68,7 @@ #define ECC_FAR0_TYPE 0x000000f0 /* Transaction type */ #define ECC_FAR0_SIZE 0x00000700 /* Transaction size */ #define ECC_FAR0_CACHE 0x00000800 /* Mapped cacheable */ -#define ECC_FAR0_LOCK 0x00001000 /* Error occurred in attomic cycle */ +#define ECC_FAR0_LOCK 0x00001000 /* Error occurred in atomic cycle */ #define ECC_FAR0_BMODE 0x00002000 /* Boot mode */ #define ECC_FAR0_VADDR 0x003fc000 /* VA[12-19] (superset bits) */ #define ECC_FAR0_S 0x08000000 /* Supervisor mode */ @@ -90,6 +90,7 @@ #define ECC_ADDR_MASK (ECC_SIZE - 1) typedef struct ECCState { + qemu_irq irq; uint32_t regs[ECC_NREGS]; } ECCState; @@ -222,7 +223,7 @@ static void ecc_reset(void *opaque) s->regs[i] = 0; } -void * ecc_init(target_phys_addr_t base, uint32_t version) +void * ecc_init(target_phys_addr_t base, qemu_irq irq, uint32_t version) { int ecc_io_memory; ECCState *s; @@ -232,6 +233,7 @@ void * ecc_init(target_phys_addr_t base, uint32_t version) return NULL; s->regs[0] = version; + s->irq = irq; ecc_io_memory = cpu_register_io_memory(0, ecc_mem_read, ecc_mem_write, s); cpu_register_physical_memory(base, ECC_SIZE, ecc_io_memory); -- cgit v1.2.3