[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 13/16] piix4: add a speaker as specified in datas
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v4 13/16] piix4: add a speaker as specified in datasheet |
Date: |
Sat, 6 Jan 2018 16:37:27 +0100 |
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 0d68fcb193..b313e4fe73 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -30,6 +30,7 @@
#include "hw/isa/isa.h"
#include "hw/char/isa.h"
#include "hw/sysbus.h"
+#include "hw/audio/pcspk.h"
#include "hw/timer/i8254.h"
#include "hw/timer/mc146818rtc.h"
#include "qapi/error.h"
@@ -148,6 +149,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;
int i;
Error *err = NULL;
@@ -174,7 +176,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 */
DMA_init(isa_bus, 0);
--
2.11.0
- Re: [Qemu-devel] [PATCH v4 10/16] piix4: add a i8042 keyboard/mouse controller as specified in datasheet, (continued)
- [Qemu-devel] [PATCH v4 08/16] piix4: add a i8257 dma controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 01/16] fdc: move object structures to header file, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 05/16] piix4: rename some variables in realize function, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 09/16] piix4: add a i8254 pit controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 04/16] mc146818rtc: always register rtc to rtc list, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 11/16] piix4: add a floppy controller, 1 parallel port and 2 serial ports, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 13/16] piix4: add a speaker as specified in datasheet,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v4 12/16] piix4: add a mc146818rtc controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 15/16] piix4: rename PIIX4 object to piix4-isa, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 14/16] piix4: convert reset function to QOM, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 16/16] piix4: we can now instanciate a PIIX4 with -device, Hervé Poussineau, 2018/01/06
- Re: [Qemu-devel] [PATCH v4 00/16] piix4: cleanup and improvements, Philippe Mathieu-Daudé, 2018/01/07