[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 17/23] q800: move ESP device to Q800MachineState
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v3 17/23] q800: move ESP device to Q800MachineState |
Date: |
Sun, 4 Jun 2023 14:14:44 +0100 |
Also change the instantiation of the ESP 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 | 9 +++++----
include/hw/m68k/q800.h | 2 ++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 0a415a7c6a..3ab4607134 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -376,8 +376,9 @@ static void q800_machine_init(MachineState *machine)
/* SCSI */
- dev = qdev_new(TYPE_SYSBUS_ESP);
- sysbus_esp = SYSBUS_ESP(dev);
+ object_initialize_child(OBJECT(machine), "esp", &m->esp,
+ TYPE_SYSBUS_ESP);
+ sysbus_esp = SYSBUS_ESP(&m->esp);
esp = &sysbus_esp->esp;
esp->dma_memory_read = NULL;
esp->dma_memory_write = NULL;
@@ -385,8 +386,8 @@ static void q800_machine_init(MachineState *machine)
sysbus_esp->it_shift = 4;
esp->dma_enabled = 1;
- sysbus = SYS_BUS_DEVICE(dev);
- sysbus_realize_and_unref(sysbus, &error_fatal);
+ sysbus = SYS_BUS_DEVICE(&m->esp);
+ sysbus_realize(sysbus, &error_fatal);
/* SCSI and SCSI data IRQs are negative edge triggered */
sysbus_connect_irq(sysbus, 0,
qemu_irq_invert(
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 36e1bd8e4e..8f23e0c4c6 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -32,6 +32,7 @@
#include "hw/net/dp8393x.h"
#include "hw/char/escc.h"
#include "hw/or-irq.h"
+#include "hw/scsi/esp.h"
/*
* The main Q800 machine
@@ -48,6 +49,7 @@ struct Q800MachineState {
dp8393xState dp8393x;
ESCCState escc;
OrIRQState escc_orgate;
+ SysBusESPState esp;
MemoryRegion macio;
MemoryRegion macio_alias;
};
--
2.30.2
- Re: [PATCH v3 10/23] q800: reimplement mac-io region aliasing using IO memory region, (continued)
- [PATCH v3 11/23] q800: move VIA1 device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 16/23] q800: move escc_orgate device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [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 <=
- [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, 2023/06/04
- [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