All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Hervé Poussineau" <hpoussin@reactos.org>
To: Aurelien Jarno <aurelien@aurel32.net>,
	Yongbok Kim <yongbok.kim@mips.com>,
	"Michael S . Tsirkin" <mst@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	qemu-devel@nongnu.org
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
Subject: [Qemu-devel] [PATCH 13/15] piix4: add a speaker as specified in datasheet
Date: Sat, 16 Dec 2017 10:02:26 +0100	[thread overview]
Message-ID: <20171216090228.28505-14-hpoussin@reactos.org> (raw)
In-Reply-To: <20171216090228.28505-1-hpoussin@reactos.org>

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 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 82890f0712..7358d7f5db 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 */
-    pit_init(isa_bus, 0x40, 0, NULL);
+    pit = pit_init(isa_bus, 0x40, 0, NULL);
+
+    /* speaker */
+    pcspk_init(isa_bus, pit);
 
     /* DMA */
     DMA_init(isa_bus, 0);
-- 
2.11.0

  parent reply	other threads:[~2017-12-16  9:03 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-16  9:02 [Qemu-devel] [PATCH 00/15] piix4: cleanup and improvements Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 01/15] fdc: move object structures to header file Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 02/15] serial/parallel: " Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 03/15] mc146818rtc: move structure " Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 04/15] mc146818rtc: always register rtc to rtc list Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 05/15] piix4: rename some variables in realize function Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 06/15] piix4: add Reset Control Register Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 07/15] piix4: add a i8259 interrupt controller as specified in datasheet Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 08/15] piix4: add a i8257 dma " Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 09/15] piix4: add a i8254 pit " Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 10/15] piix4: add a i8042 keyboard/mouse " Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 11/15] piix4: add a floppy controller, 1 parallel port and 2 serial ports Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 12/15] piix4: add a mc146818rtc controller as specified in datasheet Hervé Poussineau
2017-12-16  9:02 ` Hervé Poussineau [this message]
2017-12-16  9:02 ` [Qemu-devel] [PATCH 14/15] piix4: rename PIIX4 object to piix4-isa Hervé Poussineau
2017-12-16  9:02 ` [Qemu-devel] [PATCH 15/15] piix4: we can now instanciate a PIIX4 with -device Hervé Poussineau
2017-12-16  9:21 ` [Qemu-devel] [PATCH 00/15] piix4: cleanup and improvements no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171216090228.28505-14-hpoussin@reactos.org \
    --to=hpoussin@reactos.org \
    --cc=aurelien@aurel32.net \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=yongbok.kim@mips.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.