[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 15/20] audio: rework pcspk_init()
From: |
Gerd Hoffmann |
Subject: |
[PATCH v4 15/20] audio: rework pcspk_init() |
Date: |
Wed, 24 Jun 2020 13:30:21 +0200 |
Instead of creating and returning the pc speaker accept it as argument.
That allows to rework the initialization workflow in followup patches.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/audio/pcspk.h | 6 +-----
hw/i386/pc.c | 2 +-
hw/isa/i82378.c | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h
index 7e7f5f49dcb0..8b485602675f 100644
--- a/include/hw/audio/pcspk.h
+++ b/include/hw/audio/pcspk.h
@@ -31,18 +31,14 @@
#define TYPE_PC_SPEAKER "isa-pcspk"
-static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit)
+static inline void pcspk_init(ISADevice *isadev, ISABus *bus, ISADevice *pit)
{
DeviceState *dev;
- ISADevice *isadev;
- isadev = isa_new(TYPE_PC_SPEAKER);
dev = DEVICE(isadev);
qdev_prop_set_uint32(dev, "iobase", 0x61);
object_property_set_link(OBJECT(dev), OBJECT(pit), "pit", NULL);
isa_realize_and_unref(isadev, bus, &error_fatal);
-
- return isadev;
}
#endif /* HW_PCSPK_H */
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ba88e1dfb80f..3f1d42b05102 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1240,7 +1240,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
/* connect PIT to output control line of the HPET */
qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(DEVICE(pit), 0));
}
- pcspk_init(isa_bus, pit);
+ pcspk_init(isa_new(TYPE_PC_SPEAKER), isa_bus, pit);
}
i8257_dma_init(isa_bus, 0);
diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c
index d9e6c7fa0096..75a2da288157 100644
--- a/hw/isa/i82378.c
+++ b/hw/isa/i82378.c
@@ -102,7 +102,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
pit = i8254_pit_init(isabus, 0x40, 0, NULL);
/* speaker */
- pcspk_init(isabus, pit);
+ pcspk_init(isa_new(TYPE_PC_SPEAKER), isabus, pit);
/* 2 82C37 (dma) */
isa_create_simple(isabus, "i82374");
--
2.18.4
- [PATCH v4 08/20] audio: deprecate -soundhw gus, (continued)
- [PATCH v4 08/20] audio: deprecate -soundhw gus, Gerd Hoffmann, 2020/06/24
- [PATCH v4 14/20] softmmu: initialize spice and audio earlier, Gerd Hoffmann, 2020/06/24
- [PATCH v4 07/20] audio: deprecate -soundhw cs4231a, Gerd Hoffmann, 2020/06/24
- [PATCH v4 05/20] audio: deprecate -soundhw es1370, Gerd Hoffmann, 2020/06/24
- [PATCH v4 01/20] stubs: add isa_create_simple, Gerd Hoffmann, 2020/06/24
- [PATCH v4 18/20] audio: add soundhw deprecation notice, Gerd Hoffmann, 2020/06/24
- [PATCH v4 13/20] pc_basic_device_init: drop no_vmport arg, Gerd Hoffmann, 2020/06/24
- [PATCH v4 03/20] audio: add deprecated_register_soundhw, Gerd Hoffmann, 2020/06/24
- [PATCH v4 04/20] audio: deprecate -soundhw ac97, Gerd Hoffmann, 2020/06/24
- [PATCH v4 15/20] audio: rework pcspk_init(),
Gerd Hoffmann <=
- [PATCH v4 16/20] audio: create pcspk device early, Gerd Hoffmann, 2020/06/24