diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-02-15 15:36:42 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-02-27 22:29:02 +0100 |
| commit | 8e7db8ab5179474b6277d549d62c1184681dc915 (patch) | |
| tree | 75afe0c8db34b722add1501fe5fd6b8a49b1a050 /hw/audio/sb16.c | |
| parent | d2fbec575f652dc35239c5b026f7ebabc548beb1 (diff) | |
| download | focaccia-qemu-8e7db8ab5179474b6277d549d62c1184681dc915.tar.gz focaccia-qemu-8e7db8ab5179474b6277d549d62c1184681dc915.zip | |
hw: Replace isa_get_irq() by isa_bus_get_irq() when ISABus is available
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20230215161641.32663-4-philmd@linaro.org>
Diffstat (limited to 'hw/audio/sb16.c')
| -rw-r--r-- | hw/audio/sb16.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index ae745c7283..535ccccdc9 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -1398,17 +1398,18 @@ static void sb16_initfn (Object *obj) static void sb16_realizefn (DeviceState *dev, Error **errp) { ISADevice *isadev = ISA_DEVICE (dev); + ISABus *bus = isa_bus_from_device(isadev); SB16State *s = SB16 (dev); IsaDmaClass *k; - s->isa_hdma = isa_bus_get_dma(isa_bus_from_device(isadev), s->hdma); - s->isa_dma = isa_bus_get_dma(isa_bus_from_device(isadev), s->dma); + s->isa_hdma = isa_bus_get_dma(bus, s->hdma); + s->isa_dma = isa_bus_get_dma(bus, s->dma); if (!s->isa_dma || !s->isa_hdma) { error_setg(errp, "ISA controller does not support DMA"); return; } - s->pic = isa_get_irq(isadev, s->irq); + s->pic = isa_bus_get_irq(bus, s->irq); s->mixer_regs[0x80] = magic_of_irq (s->irq); s->mixer_regs[0x81] = (1 << s->dma) | (1 << s->hdma); |