[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 14/23] q800: move dp8393x device to Q800MachineState
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v3 14/23] q800: move dp8393x device to Q800MachineState |
Date: |
Sun, 4 Jun 2023 14:14:41 +0100 |
Also change the instantiation of the dp8393x device to use
object_initialize_child().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Jason Wang <jasowang@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
hw/m68k/q800.c | 6 ++++--
include/hw/m68k/q800.h | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index c2e937a929..05194a06a0 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -315,14 +315,16 @@ static void q800_machine_init(MachineState *machine)
nd_table[0].macaddr.a[1] = 0x00;
nd_table[0].macaddr.a[2] = 0x07;
- dev = qdev_new("dp8393x");
+ object_initialize_child(OBJECT(machine), "dp8393x", &m->dp8393x,
+ TYPE_DP8393X);
+ dev = DEVICE(&m->dp8393x);
qdev_set_nic_properties(dev, &nd_table[0]);
qdev_prop_set_uint8(dev, "it_shift", 2);
qdev_prop_set_bit(dev, "big_endian", true);
object_property_set_link(OBJECT(dev), "dma_mr",
OBJECT(get_system_memory()), &error_abort);
sysbus = SYS_BUS_DEVICE(dev);
- sysbus_realize_and_unref(sysbus, &error_fatal);
+ sysbus_realize(sysbus, &error_fatal);
memory_region_add_subregion(&m->macio, SONIC_BASE - IO_BASE,
sysbus_mmio_get_region(sysbus, 0));
sysbus_connect_irq(sysbus, 0,
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 06c771635b..d11bc020ed 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -29,6 +29,7 @@
#include "exec/memory.h"
#include "hw/m68k/q800-glue.h"
#include "hw/misc/mac_via.h"
+#include "hw/net/dp8393x.h"
/*
* The main Q800 machine
@@ -42,6 +43,7 @@ struct Q800MachineState {
GLUEState glue;
MOS6522Q800VIA1State via1;
MOS6522Q800VIA2State via2;
+ dp8393xState dp8393x;
MemoryRegion macio;
MemoryRegion macio_alias;
};
--
2.30.2
- [PATCH v3 16/23] q800: move escc_orgate device to Q800MachineState, (continued)
- [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, 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 <=
- [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
- [PATCH v3 23/23] mac_via: fix rtc command decoding for the PRAM seconds registers, Mark Cave-Ayland, 2023/06/04