diff options
Diffstat (limited to 'include/hw/misc')
| -rw-r--r-- | include/hw/misc/mac_via.h | 5 | ||||
| -rw-r--r-- | include/hw/misc/mos6522.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h index 0af346366e..5fe7a7f592 100644 --- a/include/hw/misc/mac_via.h +++ b/include/hw/misc/mac_via.h @@ -24,8 +24,6 @@ #define VIA1_IRQ_ADB_DATA_BIT CB2_INT_BIT #define VIA1_IRQ_ADB_CLOCK_BIT CB1_INT_BIT -#define VIA1_IRQ_NB 8 - #define VIA1_IRQ_ONE_SECOND BIT(VIA1_IRQ_ONE_SECOND_BIT) #define VIA1_IRQ_60HZ BIT(VIA1_IRQ_60HZ_BIT) #define VIA1_IRQ_ADB_READY BIT(VIA1_IRQ_ADB_READY_BIT) @@ -42,7 +40,6 @@ struct MOS6522Q800VIA1State { MemoryRegion via_mem; - qemu_irq irqs[VIA1_IRQ_NB]; qemu_irq auxmode_irq; uint8_t last_b; @@ -85,8 +82,6 @@ struct MOS6522Q800VIA1State { #define VIA2_IRQ_SCSI_BIT CB2_INT_BIT #define VIA2_IRQ_ASC_BIT CB1_INT_BIT -#define VIA2_IRQ_NB 8 - #define VIA2_IRQ_SCSI_DATA BIT(VIA2_IRQ_SCSI_DATA_BIT) #define VIA2_IRQ_NUBUS BIT(VIA2_IRQ_NUBUS_BIT) #define VIA2_IRQ_UNUSED BIT(VIA2_IRQ_SCSI_BIT) diff --git a/include/hw/misc/mos6522.h b/include/hw/misc/mos6522.h index be5c90d24d..f38ae2b0f0 100644 --- a/include/hw/misc/mos6522.h +++ b/include/hw/misc/mos6522.h @@ -57,6 +57,8 @@ #define T2_INT BIT(T2_INT_BIT) #define T1_INT BIT(T1_INT_BIT) +#define VIA_NUM_INTS 5 + /* Bits in ACR */ #define T1MODE 0xc0 /* Timer 1 mode */ #define T1MODE_CONT 0x40 /* continuous interrupts */ |