mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/isa: Rename isa_get_dma() -> isa_bus_get_dma()

Browse Source 
isa_get_dma() returns a DMA channel handler from an ISABus.
To emphasize this, rename it as isa_bus_get_dma().

Mechanical change using:

  $ sed -i -e 's/isa_get_dma/isa_bus_get_dma/g' \
        $(git grep -l isa_get_dma)

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230215161641.32663-2-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-02-15 15:38:19 +01:00
parent e5bf2779a1
commit dc8d6cf203
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/audio/cs4231a.c
View File

@ -671,7 +671,7 @@ static void cs4231a_realizefn (DeviceState *dev, Error **errp)
CSState *s = CS4231A (dev); CSState *s = CS4231A (dev);
IsaDmaClass *k; IsaDmaClass *k;
s->isa_dma = isa_get_dma(isa_bus_from_device(d), s->dma); s->isa_dma = isa_bus_get_dma(isa_bus_from_device(d), s->dma);
if (!s->isa_dma) { if (!s->isa_dma) {
error_setg(errp, "ISA controller does not support DMA"); error_setg(errp, "ISA controller does not support DMA");
return; return;

2
hw/audio/gus.c
View File

@ -240,7 +240,7 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
IsaDmaClass *k; IsaDmaClass *k;
struct audsettings as; struct audsettings as;
s->isa_dma = isa_get_dma(isa_bus_from_device(d), s->emu.gusdma); s->isa_dma = isa_bus_get_dma(isa_bus_from_device(d), s->emu.gusdma);
if (!s->isa_dma) { if (!s->isa_dma) {
error_setg(errp, "ISA controller does not support DMA"); error_setg(errp, "ISA controller does not support DMA");
return; return;

4
hw/audio/sb16.c
View File

@ -1401,8 +1401,8 @@ static void sb16_realizefn (DeviceState *dev, Error **errp)
SB16State *s = SB16 (dev); SB16State *s = SB16 (dev);
IsaDmaClass *k; IsaDmaClass *k;
s->isa_hdma = isa_get_dma(isa_bus_from_device(isadev), s->hdma); s->isa_hdma = isa_bus_get_dma(isa_bus_from_device(isadev), s->hdma);
s->isa_dma = isa_get_dma(isa_bus_from_device(isadev), s->dma); s->isa_dma = isa_bus_get_dma(isa_bus_from_device(isadev), s->dma);
if (!s->isa_dma || !s->isa_hdma) { if (!s->isa_dma || !s->isa_hdma) {
error_setg(errp, "ISA controller does not support DMA"); error_setg(errp, "ISA controller does not support DMA");
return; return;

2
hw/block/fdc-isa.c
View File

@ -98,7 +98,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp)
fdctrl->dma_chann = isa->dma; fdctrl->dma_chann = isa->dma;
if (fdctrl->dma_chann != -1) { if (fdctrl->dma_chann != -1) {
IsaDmaClass *k; IsaDmaClass *k;
fdctrl->dma = isa_get_dma(isa_bus_from_device(isadev), isa->dma); fdctrl->dma = isa_bus_get_dma(isa_bus_from_device(isadev), isa->dma);
if (!fdctrl->dma) { if (!fdctrl->dma) {
error_setg(errp, "ISA controller does not support DMA"); error_setg(errp, "ISA controller does not support DMA");
return; return;

2
hw/dma/i82374.c
View File

@ -125,7 +125,7 @@ static void i82374_realize(DeviceState *dev, Error **errp)
I82374State *s = I82374(dev); I82374State *s = I82374(dev);
ISABus *isa_bus = isa_bus_from_device(ISA_DEVICE(dev)); ISABus *isa_bus = isa_bus_from_device(ISA_DEVICE(dev));
if (isa_get_dma(isa_bus, 0)) { if (isa_bus_get_dma(isa_bus, 0)) {
error_setg(errp, "DMA already initialized on ISA bus"); error_setg(errp, "DMA already initialized on ISA bus");
return; return;
} }

2
hw/isa/isa-bus.c
View File

@ -99,7 +99,7 @@ void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16)
bus->dma[1] = dma16; bus->dma[1] = dma16;
} }
IsaDma *isa_get_dma(ISABus *bus, int nchan) IsaDma *isa_bus_get_dma(ISABus *bus, int nchan)
{ {
assert(bus); assert(bus);
return bus->dma[nchan > 3 ? 1 : 0]; return bus->dma[nchan > 3 ? 1 : 0];

2
include/hw/isa/isa.h
View File

@ -71,7 +71,7 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space,
MemoryRegion *address_space_io, Error **errp); MemoryRegion *address_space_io, Error **errp);
void isa_bus_register_input_irqs(ISABus *bus, qemu_irq *irqs_in); void isa_bus_register_input_irqs(ISABus *bus, qemu_irq *irqs_in);
void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16); void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16);
IsaDma *isa_get_dma(ISABus *bus, int nchan); IsaDma *isa_bus_get_dma(ISABus *bus, int nchan);
ISADevice *isa_new(const char *name); ISADevice *isa_new(const char *name);
ISADevice *isa_try_new(const char *name); ISADevice *isa_try_new(const char *name);
bool isa_realize_and_unref(ISADevice *dev, ISABus *bus, Error **errp); bool isa_realize_and_unref(ISADevice *dev, ISABus *bus, Error **errp);