diff options
| author | Mark Cave-Ayland | 2021-08-30 12:24:44 +0200 |
|---|---|---|
| committer | Laurent Vivier | 2021-09-08 15:37:40 +0200 |
| commit | 02a68a3e6588b4bea4e1abbf16aa9949c084e8bc (patch) | |
| tree | 2ec576528f3ab3b675fbc7d88a89555983b2babc /include/hw/misc | |
| parent | mac_via: move VIA1 realize logic from mac_via_realize() to mos6522_q800_via1_... (diff) | |
| download | qemu-02a68a3e6588b4bea4e1abbf16aa9949c084e8bc.tar.gz qemu-02a68a3e6588b4bea4e1abbf16aa9949c084e8bc.tar.xz qemu-02a68a3e6588b4bea4e1abbf16aa9949c084e8bc.zip | |
mac_via: remove mac_via device
Remove the mac_via device and wire up both q800 VIA1 and VIA2 directly for the
m68k q800 machine.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210830102447.10806-10-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'include/hw/misc')
| -rw-r--r-- | include/hw/misc/mac_via.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h index 182dcb7422..9a8bca056e 100644 --- a/include/hw/misc/mac_via.h +++ b/include/hw/misc/mac_via.h @@ -15,6 +15,8 @@ #include "qom/object.h" +#define VIA_SIZE 0x2000 + /* VIA 1 */ #define VIA1_IRQ_ONE_SECOND_BIT 0 #define VIA1_IRQ_60HZ_BIT 1 @@ -38,6 +40,8 @@ struct MOS6522Q800VIA1State { /*< private >*/ MOS6522State parent_obj; + MemoryRegion via_mem; + qemu_irq irqs[VIA1_IRQ_NB]; uint8_t last_b; @@ -95,23 +99,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(MOS6522Q800VIA2State, MOS6522_Q800_VIA2) struct MOS6522Q800VIA2State { /*< private >*/ MOS6522State parent_obj; -}; - - -#define TYPE_MAC_VIA "mac_via" -OBJECT_DECLARE_SIMPLE_TYPE(MacVIAState, MAC_VIA) - -struct MacVIAState { - SysBusDevice busdev; - - /* MMIO */ - MemoryRegion mmio; - MemoryRegion via1mem; - MemoryRegion via2mem; - /* VIAs */ - MOS6522Q800VIA1State mos6522_via1; - MOS6522Q800VIA2State mos6522_via2; + MemoryRegion via_mem; }; #endif |