diff options
| author | malc <av1474@comtv.ru> | 2011-08-22 14:41:12 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-08-22 14:41:12 +0400 |
| commit | 1afa194a0a3384c5a8fd150e4335d332c22883cf (patch) | |
| tree | 87d1ca2dbfb03128e628e344a713297131bad7f7 /hw/slavio_intctl.c | |
| parent | 157f2662fb4dd8f02885027e47f79fbee83c7b94 (diff) | |
| parent | f1a7104a5f435a1bf2a1158e6f737dbd89e8c153 (diff) | |
| download | focaccia-qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.tar.gz focaccia-qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/slavio_intctl.c')
| -rw-r--r-- | hw/slavio_intctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c index a83e5b8272..329c251845 100644 --- a/hw/slavio_intctl.c +++ b/hw/slavio_intctl.c @@ -46,22 +46,22 @@ struct SLAVIO_INTCTLState; typedef struct SLAVIO_CPUINTCTLState { - uint32_t intreg_pending; struct SLAVIO_INTCTLState *master; + uint32_t intreg_pending; uint32_t cpu; uint32_t irl_out; } SLAVIO_CPUINTCTLState; typedef struct SLAVIO_INTCTLState { SysBusDevice busdev; - uint32_t intregm_pending; - uint32_t intregm_disabled; - uint32_t target_cpu; #ifdef DEBUG_IRQ_COUNT uint64_t irq_count[32]; #endif qemu_irq cpu_irqs[MAX_CPUS][MAX_PILS]; SLAVIO_CPUINTCTLState slaves[MAX_CPUS]; + uint32_t intregm_pending; + uint32_t intregm_disabled; + uint32_t target_cpu; } SLAVIO_INTCTLState; #define INTCTL_MAXADDR 0xf |