motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

q800: move dp8393x device to Q800MachineState

Browse source 
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>
Message-Id: <20230621085353.113233-16-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Mark Cave-Ayland 2023-06-21 09:53:44 +01:00 • committed by Laurent Vivier
parent 2db48d0364
commit 804ae67ee6
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/m68k/q800.c
View file

@ -315,14 +315,16 @@ static void q800_machine_init(MachineState *machine)
nd_table[0].macaddr.a[1] = 0x00; nd_table[0].macaddr.a[1] = 0x00;
nd_table[0].macaddr.a[2] = 0x07; 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_set_nic_properties(dev, &nd_table[0]);
qdev_prop_set_uint8(dev, "it_shift", 2); qdev_prop_set_uint8(dev, "it_shift", 2);
qdev_prop_set_bit(dev, "big_endian", true); qdev_prop_set_bit(dev, "big_endian", true);
object_property_set_link(OBJECT(dev), "dma_mr", object_property_set_link(OBJECT(dev), "dma_mr",
OBJECT(get_system_memory()), &error_abort); OBJECT(get_system_memory()), &error_abort);
sysbus = SYS_BUS_DEVICE(dev); 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, memory_region_add_subregion(&m->macio, SONIC_BASE - IO_BASE,
sysbus_mmio_get_region(sysbus, 0)); sysbus_mmio_get_region(sysbus, 0));
sysbus_connect_irq(sysbus, 0, sysbus_connect_irq(sysbus, 0,

2
include/hw/m68k/q800.h
View file

@ -29,6 +29,7 @@
#include "exec/memory.h" #include "exec/memory.h"
#include "hw/m68k/q800-glue.h" #include "hw/m68k/q800-glue.h"
#include "hw/misc/mac_via.h" #include "hw/misc/mac_via.h"
#include "hw/net/dp8393x.h"
/* /*
* The main Q800 machine * The main Q800 machine
@ -42,6 +43,7 @@ struct Q800MachineState {
GLUEState glue; GLUEState glue;
MOS6522Q800VIA1State via1; MOS6522Q800VIA1State via1;
MOS6522Q800VIA2State via2; MOS6522Q800VIA2State via2;
dp8393xState dp8393x;
MemoryRegion macio; MemoryRegion macio;
MemoryRegion macio_alias; MemoryRegion macio_alias;
}; };