[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/29] piix4: add a speaker as specified in datashee
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 20/29] piix4: add a speaker as specified in datasheet |
Date: |
Sun, 7 Jan 2018 23:45:49 -0300 |
From: Hervé Poussineau <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/isa/piix4.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 04b13f97c6..c78516e595 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -31,6 +31,7 @@
#include "hw/southbridge/i82371_piix.h"
#include "hw/dma/i8257.h"
#include "hw/sysbus.h"
+#include "hw/audio/pcspk.h"
#include "hw/timer/i8254.h"
PCIDevice *piix4_dev;
@@ -142,6 +143,7 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
DeviceState *dev = DEVICE(pci_dev);
PIIX4State *s = DO_UPCAST(PIIX4State, dev, pci_dev);
ISABus *isa_bus;
+ ISADevice *pit;
qemu_irq *i8259_out_irq;
isa_bus = isa_bus_new(dev, pci_address_space(pci_dev),
@@ -166,7 +168,10 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
isa_bus_irqs(isa_bus, s->isa);
/* initialize pit */
- i8254_pit_init(isa_bus, 0x40, 0, NULL);
+ pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
+
+ /* speaker */
+ pcspk_init(isa_bus, pit);
/* DMA */
i8257_dma_init(isa_bus, 0);
--
2.15.1
- [Qemu-devel] [PATCH 10/29] hw/mips/malta: add fdc37m81x_init() which uses isa_superio_init(), (continued)
- [Qemu-devel] [PATCH 10/29] hw/mips/malta: add fdc37m81x_init() which uses isa_superio_init(), Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 11/29] mc146818rtc: always register rtc to rtc list, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 12/29] piix4: rename some variables in realize function, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 13/29] piix4: convert reset function to QOM, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 14/29] piix4: add Reset Control Register, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 15/29] piix4: add a i8259 interrupt controller as specified in datasheet, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [RFC PATCH 16/29] Revert "irq: introduce qemu_irq_proxy()", Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 17/29] piix: move piix4 declaration into new southbridge/i82371_piix.h, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 18/29] piix4: add a i8257 dma controller as specified in datasheet, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 19/29] piix4: add a i8254 pit controller as specified in datasheet, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 20/29] piix4: add a speaker as specified in datasheet,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 21/29] piix: move southbridge related declarations/definitions to i82371_piix.h, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 22/29] piix3: extract piix3_init() from i440fx_init(), Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 23/29] hw/i386: extract i440fx related declarations/definitions to i440fx.h, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 25/29] hw/i386: move piix from hw/pci-host to hw/southbridge, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 24/29] hw/i386: extract i440fx code from piix.c into i440fx.c, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 26/29] configs/mips-softmmu: use common CONFIG_PCI_PIIX instead of CONFIG_PIIX4, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 27/29] piix3: convert reset function to QOM, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 28/29] piix: merge common code from isa/piix4.c with southbridge piix3, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [NOTFORMERGE PATCH 29/29] piix4: add isa_superio_init, Philippe Mathieu-Daudé, 2018/01/07