[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 13/16] piix4: add a speaker as specified in datas
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 13/16] piix4: add a speaker as specified in datasheet |
Date: |
Fri, 29 Dec 2017 15:29:19 +0100 |
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 09388ff286..64526e1bb8 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"
@@ -144,6 +145,7 @@ static void piix4_realize(PCIDevice *pci, Error **errp)
DeviceState *dev = DEVICE(pci);
PIIX4State *s = DO_UPCAST(PIIX4State, dev, pci);
ISABus *isa_bus;
+ ISADevice *pit;
qemu_irq *i8259_out_irq;
int i;
Error *err = NULL;
@@ -170,7 +172,10 @@ static void piix4_realize(PCIDevice *pci, 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
- [Qemu-devel] [PATCH v3 14/16] piix4: convert reset function to QOM, (continued)
- [Qemu-devel] [PATCH v3 14/16] piix4: convert reset function to QOM, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 16/16] piix4: we can now instanciate a PIIX4 with -device, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 10/16] piix4: add a i8042 keyboard/mouse controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 09/16] piix4: add a i8254 pit controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 02/16] serial/parallel: move object structures to header file, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 07/16] piix4: add a i8259 interrupt controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 06/16] piix4: add Reset Control Register, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 11/16] piix4: add a floppy controller, 1 parallel port and 2 serial ports, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 05/16] piix4: rename some variables in realize function, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 04/16] mc146818rtc: always register rtc to rtc list, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 13/16] piix4: add a speaker as specified in datasheet,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v3 01/16] fdc: move object structures to header file, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 08/16] piix4: add a i8257 dma controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 12/16] piix4: add a mc146818rtc controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 03/16] mc146818rtc: move structure to header file, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 15/16] piix4: rename PIIX4 object to piix4-isa, Hervé Poussineau, 2017/12/29