diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-12-28 18:48:39 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-12-28 18:48:39 +0000 |
| commit | 80be36b8a0859bee2c32d0102049b154c28fe63f (patch) | |
| tree | e5ce0671d7a04254346be728f8a6fedac3d7782f | |
| parent | cc2acc47d7ecee92d3948ab67d732fe5d19b8580 (diff) | |
Fix master interrupt register masking
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3867 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/slavio_intctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c index f7a35bb823..af9cdf153a 100644 --- a/hw/slavio_intctl.c +++ b/hw/slavio_intctl.c @@ -68,7 +68,7 @@ typedef struct SLAVIO_INTCTLState { #define INTCTLM_MAXADDR 0x13 #define INTCTLM_SIZE (INTCTLM_MAXADDR + 1) #define INTCTLM_MASK 0x1f -#define MASTER_IRQ_MASK ~0x4fb2007f +#define MASTER_IRQ_MASK ~0x0fa2007f #define MASTER_DISABLE 0x80000000 #define CPU_IRQ_MASK 0xfffe0000 #define CPU_IRQ_INT15_IN 0x0004000 @@ -151,7 +151,7 @@ static uint32_t slavio_intctlm_mem_readl(void *opaque, target_phys_addr_t addr) ret = s->intregm_pending & ~MASTER_DISABLE; break; case 1: - ret = s->intregm_disabled; + ret = s->intregm_disabled & MASTER_IRQ_MASK; break; case 4: ret = s->target_cpu; |