[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 18/23] q800: move SWIM device to Q800MachineState
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v3 18/23] q800: move SWIM device to Q800MachineState |
Date: |
Sun, 4 Jun 2023 14:14:45 +0100 |
Also change the instantiation of the SWIM device to use
object_initialize_child().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
hw/m68k/q800.c | 8 +++++---
include/hw/m68k/q800.h | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 3ab4607134..d6e19ff18c 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -406,10 +406,12 @@ static void q800_machine_init(MachineState *machine)
/* SWIM floppy controller */
- dev = qdev_new(TYPE_SWIM);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+ object_initialize_child(OBJECT(machine), "swim", &m->swim,
+ TYPE_SWIM);
+ sysbus = SYS_BUS_DEVICE(&m->swim);
+ sysbus_realize(sysbus, &error_fatal);
memory_region_add_subregion(&m->macio, SWIM_BASE - IO_BASE,
- sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
0));
+ sysbus_mmio_get_region(sysbus, 0));
/* NuBus */
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 8f23e0c4c6..06e095ae29 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -33,6 +33,7 @@
#include "hw/char/escc.h"
#include "hw/or-irq.h"
#include "hw/scsi/esp.h"
+#include "hw/block/swim.h"
/*
* The main Q800 machine
@@ -50,6 +51,7 @@ struct Q800MachineState {
ESCCState escc;
OrIRQState escc_orgate;
SysBusESPState esp;
+ Swim swim;
MemoryRegion macio;
MemoryRegion macio_alias;
};
--
2.30.2
- [PATCH v3 15/23] q800: move ESCC device to Q800MachineState, (continued)
- [PATCH v3 15/23] q800: move ESCC device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 12/23] q800: move VIA2 device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 13/23] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 17/23] q800: move ESP device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 20/23] q800: don't access Nubus bus directly from the mac-nubus-bridge device, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 14/23] q800: move dp8393x device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 18/23] q800: move SWIM device to Q800MachineState,
Mark Cave-Ayland <=
- [PATCH v3 19/23] q800: move mac-nubus-bridge device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 21/23] q800: move macfb device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 22/23] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 23/23] mac_via: fix rtc command decoding for the PRAM seconds registers, Mark Cave-Ayland, 2023/06/04