[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 18/23] q800: move SWIM device to Q800MachineState
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 18/23] q800: move SWIM device to Q800MachineState |
Date: |
Wed, 31 May 2023 13:53:55 +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>
---
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 befef5f822..f85ccf83af 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -407,10 +407,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 ba76aa37f2..ce8dbcd68f 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -29,6 +29,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
@@ -46,6 +47,7 @@ struct Q800MachineState {
ESCCState escc;
OrIRQState escc_orgate;
SysBusESPState esp;
+ Swim swim;
MemoryRegion macio;
MemoryRegion macio_alias;
};
--
2.30.2
- Re: [PATCH v2 12/23] q800: move VIA2 device to Q800MachineState, (continued)
- [PATCH v2 13/23] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, Mark Cave-Ayland, 2023/05/31
- [PATCH v2 14/23] q800: move dp8393x device to Q800MachineState, Mark Cave-Ayland, 2023/05/31
- [PATCH v2 15/23] q800: move ESCC device to Q800MachineState, Mark Cave-Ayland, 2023/05/31
- [PATCH v2 18/23] q800: move SWIM device to Q800MachineState,
Mark Cave-Ayland <=
- [PATCH v2 16/23] q800: move escc_orgate device to Q800MachineState, Mark Cave-Ayland, 2023/05/31
- [PATCH v2 17/23] q800: move ESP device to Q800MachineState, Mark Cave-Ayland, 2023/05/31
- [PATCH v2 20/23] q800: don't access Nubus bus directly from the mac-nubus-bridge device, Mark Cave-Ayland, 2023/05/31