[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/24] q800: move SWIM device to Q800MachineState
From: |
Laurent Vivier |
Subject: |
[PULL 19/24] q800: move SWIM device to Q800MachineState |
Date: |
Thu, 22 Jun 2023 09:55:39 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
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>
Message-Id: <20230621085353.113233-20-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/hw/m68k/q800.h | 2 ++
hw/m68k/q800.c | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 8f23e0c4c6a6..06e095ae293f 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;
};
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 9da46f445615..50fc7de9a20b 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 */
--
2.40.1
- [PULL 24/24] mac_via: fix rtc command decoding for the PRAM seconds registers, (continued)
- [PULL 24/24] mac_via: fix rtc command decoding for the PRAM seconds registers, Laurent Vivier, 2023/06/22
- [PULL 08/24] q800-glue.c: switch TypeInfo registration to use DEFINE_TYPES() macro, Laurent Vivier, 2023/06/22
- [PULL 11/24] q800: reimplement mac-io region aliasing using IO memory region, Laurent Vivier, 2023/06/22
- [PULL 06/24] q800: move ROM memory region to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 13/24] q800: move VIA2 device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 16/24] q800: move ESCC device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 07/24] q800: move GLUE device into separate q800-glue.c file, Laurent Vivier, 2023/06/22
- [PULL 18/24] q800: move ESP device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 20/24] q800: move mac-nubus-bridge device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 05/24] q800: move CPU object into Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 19/24] q800: move SWIM device to Q800MachineState,
Laurent Vivier <=
- [PULL 22/24] q800: move macfb device to Q800MachineState, Laurent Vivier, 2023/06/22
- Re: [PULL 00/24] Q800 for 8.1 patches, Richard Henderson, 2023/06/22