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

esp: Rename ESP_STATE to ESP 

Make the type checking macro name consistent with the TYPE_*
constant.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Message-Id: <20200902224311.1321159-40-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2020-09-02 18:42:47 -04:00
parent aa3c41fb00
commit 0056d51bf7
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/dma/sparc32_dma.c
View File

@ -303,7 +303,7 @@ static void sparc32_espdma_device_realize(DeviceState *dev, Error **errp)
d = qdev_new(TYPE_ESP); d = qdev_new(TYPE_ESP);
object_property_add_child(OBJECT(dev), "esp", OBJECT(d)); object_property_add_child(OBJECT(dev), "esp", OBJECT(d));
sysbus = ESP_STATE(d); sysbus = ESP(d);
esp = &sysbus->esp; esp = &sysbus->esp;
esp->dma_memory_read = espdma_memory_read; esp->dma_memory_read = espdma_memory_read;
esp->dma_memory_write = espdma_memory_write; esp->dma_memory_write = espdma_memory_write;

2
hw/m68k/q800.c
View File

@ -290,7 +290,7 @@ static void q800_init(MachineState *machine)
/* SCSI */ /* SCSI */
dev = qdev_new(TYPE_ESP); dev = qdev_new(TYPE_ESP);
sysbus_esp = ESP_STATE(dev); sysbus_esp = 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;

2
hw/mips/jazz.c
View File

@ -309,7 +309,7 @@ static void mips_jazz_init(MachineState *machine,
/* SCSI adapter */ /* SCSI adapter */
dev = qdev_new(TYPE_ESP); dev = qdev_new(TYPE_ESP);
sysbus_esp = ESP_STATE(dev); sysbus_esp = 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;

6
hw/scsi/esp.c
View File

@ -929,7 +929,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_STATE(opaque); SysBusESPState *sysbus = ESP(opaque);
ESPState *s = &sysbus->esp; ESPState *s = &sysbus->esp;
switch (irq) { switch (irq) {
@ -945,7 +945,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_STATE(dev); SysBusESPState *sysbus = ESP(dev);
ESPState *s = &sysbus->esp; ESPState *s = &sysbus->esp;
sysbus_init_irq(sbd, &s->irq); sysbus_init_irq(sbd, &s->irq);
@ -967,7 +967,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_STATE(dev); SysBusESPState *sysbus = ESP(dev);
esp_hard_reset(&sysbus->esp); esp_hard_reset(&sysbus->esp);
} }

2
hw/sparc/sun4m.c
View File

@ -335,7 +335,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_STATE(object_resolve_path_component(OBJECT(espdma), "esp")); esp = ESP(object_resolve_path_component(OBJECT(espdma), "esp"));
sysbus_mmio_map(SYS_BUS_DEVICE(esp), 0, esp_base); sysbus_mmio_map(SYS_BUS_DEVICE(esp), 0, esp_base);
scsi_bus_legacy_handle_cmdline(&esp->esp.bus); scsi_bus_legacy_handle_cmdline(&esp->esp.bus);

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

@ -67,7 +67,7 @@ struct ESPState {
#define TYPE_ESP "esp" #define TYPE_ESP "esp"
typedef struct SysBusESPState SysBusESPState; typedef struct SysBusESPState SysBusESPState;
DECLARE_INSTANCE_CHECKER(SysBusESPState, ESP_STATE, DECLARE_INSTANCE_CHECKER(SysBusESPState, ESP,
TYPE_ESP) TYPE_ESP)
struct SysBusESPState { struct SysBusESPState {