gwj / at91sam9263 · Commits

Commit 80be36b8a0859bee2c32d0102049b154c28fe63f

Authored by blueswir1
1 parent cc2acc47

Fix master interrupt register masking 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3867 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
hw/slavio_intctl.c
  View file @80be36b
... ... @@ -68,7 +68,7 @@ typedef struct SLAVIO_INTCTLState {
68 68 #define INTCTLM_MAXADDR 0x13
69 69 #define INTCTLM_SIZE (INTCTLM_MAXADDR + 1)
70 70 #define INTCTLM_MASK 0x1f
71   -#define MASTER_IRQ_MASK ~0x4fb2007f
  71 +#define MASTER_IRQ_MASK ~0x0fa2007f
72 72 #define MASTER_DISABLE 0x80000000
73 73 #define CPU_IRQ_MASK 0xfffe0000
74 74 #define CPU_IRQ_INT15_IN 0x0004000
... ... @@ -151,7 +151,7 @@ static uint32_t slavio_intctlm_mem_readl(void *opaque, target_phys_addr_t addr)
151 151 ret = s->intregm_pending & ~MASTER_DISABLE;
152 152 break;
153 153 case 1:
154   - ret = s->intregm_disabled;
  154 + ret = s->intregm_disabled & MASTER_IRQ_MASK;
155 155 break;
156 156 case 4:
157 157 ret = s->target_cpu;
... ...