To keep the patch diff simple, an inline function is used (then removed in the next commit).
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- include/hw/dma/i8257.h | 6 +++++- hw/dma/i82374.c | 2 +- hw/dma/i8257.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h index 3053f18797..986319e4e3 100644 --- a/include/hw/dma/i8257.h +++ b/include/hw/dma/i8257.h @@ -46,6 +46,10 @@ typedef struct I8257State { PortioList portio_pageh; } I8257State; -void i8257_dma_init(ISABus *bus, bool high_page_enable); +void i8257_dma_init_cascaded(ISABus *bus, bool high_page_enable); +static inline void i8257_dma_init(ISABus *bus, bool high_page_enable) +{ + i8257_dma_init_cascaded(bus, high_page_enable); +} #endif diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 892f655a7e..b95edd7b98 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -125,7 +125,7 @@ static void i82374_realize(DeviceState *dev, Error **errp) error_setg(errp, "DMA already initialized on ISA bus"); return; } - i8257_dma_init(isa_bus, true); + i8257_dma_init_cascaded(isa_bus, true); portio_list_init(&s->port_list, OBJECT(s), i82374_portio_list, s, "i82374"); diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 72f8893b9e..c930c4c531 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -654,7 +654,7 @@ static ISADevice *i8257_dma_init_slave(ISABus *bus, bool high_page_enable) return isa; } -void i8257_dma_init(ISABus *bus, bool high_page_enable) +void i8257_dma_init_cascaded(ISABus *bus, bool high_page_enable) { ISADevice *master, *slave; -- 2.16.3