OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

esp: rename existing ESP QOM type to SYSBUS_ESP 

The existing ESP QOM type currently represents a sysbus device with an embedded
ESP state. Rename the type to SYSBUS_ESP accordingly.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210304221103.6369-3-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2021-03-04 22:10:23 +00:00
parent 94d5c79d32
commit 84fbefedfe
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/dma/sparc32_dma.c
View File

@ -295,13 +295,13 @@ static void sparc32_espdma_device_init(Object *obj)
memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s, memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s,
"espdma-mmio", DMA_SIZE); "espdma-mmio", DMA_SIZE);
object_initialize_child(obj, "esp", &es->esp, TYPE_ESP); object_initialize_child(obj, "esp", &es->esp, TYPE_SYSBUS_ESP);
} }
static void sparc32_espdma_device_realize(DeviceState *dev, Error **errp) static void sparc32_espdma_device_realize(DeviceState *dev, Error **errp)
{ {
ESPDMADeviceState *es = SPARC32_ESPDMA_DEVICE(dev); ESPDMADeviceState *es = SPARC32_ESPDMA_DEVICE(dev);
SysBusESPState *sysbus = ESP(&es->esp); SysBusESPState *sysbus = SYSBUS_ESP(&es->esp);
ESPState *esp = &sysbus->esp; ESPState *esp = &sysbus->esp;
esp->dma_memory_read = espdma_memory_read; esp->dma_memory_read = espdma_memory_read;

4
hw/m68k/q800.c
View File

@ -350,8 +350,8 @@ static void q800_init(MachineState *machine)
/* SCSI */ /* SCSI */
dev = qdev_new(TYPE_ESP); dev = qdev_new(TYPE_SYSBUS_ESP);
sysbus_esp = ESP(dev); sysbus_esp = SYSBUS_ESP(dev);
esp = &sysbus_esp->esp; esp = &sysbus_esp->esp;
esp->dma_memory_read = NULL; esp->dma_memory_read = NULL;
esp->dma_memory_write = NULL; esp->dma_memory_write = NULL;

4
hw/mips/jazz.c
View File

@ -328,8 +328,8 @@ static void mips_jazz_init(MachineState *machine,
} }
/* SCSI adapter */ /* SCSI adapter */
dev = qdev_new(TYPE_ESP); dev = qdev_new(TYPE_SYSBUS_ESP);
sysbus_esp = ESP(dev); sysbus_esp = SYSBUS_ESP(dev);
esp = &sysbus_esp->esp; esp = &sysbus_esp->esp;
esp->dma_memory_read = rc4030_dma_read; esp->dma_memory_read = rc4030_dma_read;
esp->dma_memory_write = rc4030_dma_write; esp->dma_memory_write = rc4030_dma_write;

8
hw/scsi/esp.c
View File

@ -938,7 +938,7 @@ static const struct SCSIBusInfo esp_scsi_info = {
static void sysbus_esp_gpio_demux(void *opaque, int irq, int level) static void sysbus_esp_gpio_demux(void *opaque, int irq, int level)
{ {
SysBusESPState *sysbus = ESP(opaque); SysBusESPState *sysbus = SYSBUS_ESP(opaque);
ESPState *s = &sysbus->esp; ESPState *s = &sysbus->esp;
switch (irq) { switch (irq) {
@ -954,7 +954,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq, int level)
static void sysbus_esp_realize(DeviceState *dev, Error **errp) static void sysbus_esp_realize(DeviceState *dev, Error **errp)
{ {
SysBusDevice *sbd = SYS_BUS_DEVICE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
SysBusESPState *sysbus = ESP(dev); SysBusESPState *sysbus = SYSBUS_ESP(dev);
ESPState *s = &sysbus->esp; ESPState *s = &sysbus->esp;
sysbus_init_irq(sbd, &s->irq); sysbus_init_irq(sbd, &s->irq);
@ -976,7 +976,7 @@ static void sysbus_esp_realize(DeviceState *dev, Error **errp)
static void sysbus_esp_hard_reset(DeviceState *dev) static void sysbus_esp_hard_reset(DeviceState *dev)
{ {
SysBusESPState *sysbus = ESP(dev); SysBusESPState *sysbus = SYSBUS_ESP(dev);
esp_hard_reset(&sysbus->esp); esp_hard_reset(&sysbus->esp);
} }
@ -1001,7 +1001,7 @@ static void sysbus_esp_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo sysbus_esp_info = { static const TypeInfo sysbus_esp_info = {
.name = TYPE_ESP, .name = TYPE_SYSBUS_ESP,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SysBusESPState), .instance_size = sizeof(SysBusESPState),
.class_init = sysbus_esp_class_init, .class_init = sysbus_esp_class_init,

2
hw/sparc/sun4m.c
View File

@ -334,7 +334,7 @@ static void *sparc32_dma_init(hwaddr dma_base,
OBJECT(dma), "espdma")); OBJECT(dma), "espdma"));
sysbus_connect_irq(SYS_BUS_DEVICE(espdma), 0, espdma_irq); sysbus_connect_irq(SYS_BUS_DEVICE(espdma), 0, espdma_irq);
esp = ESP(object_resolve_path_component(OBJECT(espdma), "esp")); esp = SYSBUS_ESP(object_resolve_path_component(OBJECT(espdma), "esp"));
ledma = SPARC32_LEDMA_DEVICE(object_resolve_path_component( ledma = SPARC32_LEDMA_DEVICE(object_resolve_path_component(
OBJECT(dma), "ledma")); OBJECT(dma), "ledma"));

4
include/hw/scsi/esp.h
View File

@ -65,8 +65,8 @@ struct ESPState {
void (*pdma_cb)(ESPState *s); void (*pdma_cb)(ESPState *s);
}; };
#define TYPE_ESP "esp" #define TYPE_SYSBUS_ESP "sysbus-esp"
OBJECT_DECLARE_SIMPLE_TYPE(SysBusESPState, ESP) OBJECT_DECLARE_SIMPLE_TYPE(SysBusESPState, SYSBUS_ESP)
struct SysBusESPState { struct SysBusESPState {
/*< private >*/ /*< private >*/