qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Andreas Färber" <andreas.faerber@web.de>
To: qemu-devel@nongnu.org
Cc: "Andreas Färber" <andreas.faerber@web.de>,
	"Hervé Poussineau" <hpoussin@reactos.org>
Subject: [Qemu-devel] [RFC 21/23] 40p: Add an audio card and a keyboard
Date: Tue, 14 Jun 2011 04:37:55 +0200	[thread overview]
Message-ID: <1308019077-61957-22-git-send-email-andreas.faerber@web.de> (raw)
In-Reply-To: <1308019077-61957-21-git-send-email-andreas.faerber@web.de>

From: Hervé Poussineau <hpoussin@reactos.org>

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
---
 default-configs/ppc-softmmu.mak |    1 +
 hw/ppc_prep.c                   |    8 ++++++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 0999008..303929f 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -19,6 +19,7 @@ CONFIG_I82378=y
 CONFIG_PC87312=y
 CONFIG_MACIO=y
 CONFIG_PCSPK=y
+CONFIG_CS4231A=y
 CONFIG_CUDA=y
 CONFIG_ADB=y
 CONFIG_MAC_NVRAM=y
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 935d1e9..4759a03 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -848,6 +848,14 @@ static void ibm_40p_init(ram_addr_t ram_size,
         qdev_prop_set(&isa->qdev, "floppyB", drive->bdrv, PROP_TYPE_DRIVE);
     }
     qdev_init_nofail(&isa->qdev);
+
+    /* Audio */
+    isa = isa_create("cs4231a");
+    qdev_prop_set_uint32(&isa->qdev, "iobase", 0x830);
+    qdev_prop_set_uint32(&isa->qdev, "irq", 10);
+    qdev_init_nofail(&isa->qdev);
+
+    isa_create_simple("i8042");
 }
 
 static QEMUMachine prep_machine = {
-- 
1.7.5.3

  reply	other threads:[~2011-06-14  2:38 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-14  2:37 [Qemu-devel] [RFC 00/23] PReP 40P emulation Andreas Färber
2011-06-14  2:37 ` [Qemu-devel] [PATCH RFC 01/23] prep: Refactor CPU initialization Andreas Färber
2011-06-14  2:37   ` [Qemu-devel] [RFC 02/23] prep: qdev'ify PCI Andreas Färber
2011-06-14  2:37     ` [Qemu-devel] [RFC 03/23] prep: Prepare emulation of an IBM RS/6000 6015 / 7020 (40p) Andreas Färber
2011-06-14  2:37       ` [Qemu-devel] [RFC 04/23] 40p: Add PCI host Andreas Färber
2011-06-14  2:37         ` [Qemu-devel] [RFC 05/23] prep: Add i82374 DMA emulation Andreas Färber
2011-06-14  2:37           ` [Qemu-devel] [RFC 06/23] prep: Add i82378 PCI-to-ISA bridge emulation Andreas Färber
2011-06-14  2:37             ` [Qemu-devel] [RFC 07/23] 40p: Add a PCI to ISA bridge (i82378) Andreas Färber
2011-06-14  2:37               ` [Qemu-devel] [PATCH v5 08/23] qdev: Add support for property type bool Andreas Färber
2011-06-14  2:37                 ` [Qemu-devel] [PATCH v5 09/23] qdev: Add helpers for reading properties Andreas Färber
2011-06-14  2:37                   ` [Qemu-devel] [RFC v5 10/23] isa: Provide enable and disable callbacks Andreas Färber
2011-06-14  2:37                     ` [Qemu-devel] [RFC v5 11/23] isa: Allow to un-assign I/O ports Andreas Färber
2011-06-14  2:37                       ` [Qemu-devel] [RFC v5 12/23] isa: Allow to un-associate an IRQ Andreas Färber
2011-06-14  2:37                         ` [Qemu-devel] [RFC v5 13/23] parallel: Implement ISA state callbacks Andreas Färber
2011-06-14  2:37                           ` [Qemu-devel] [RFC v5 14/23] serial: " Andreas Färber
2011-06-14  2:37                             ` [Qemu-devel] [PATCH v5 15/23] fdc: Parametrize ISA base, IRQ and DMA Andreas Färber
2011-06-14  2:37                               ` [Qemu-devel] [RFC v5 16/23] fdc: Implement ISA state callbacks Andreas Färber
2011-06-14  2:37                                 ` [Qemu-devel] [RFC v5 17/23] ide: Allow to discard I/O ports Andreas Färber
2011-06-14  2:37                                   ` [Qemu-devel] [RFC v5 18/23] ide: Implement ISA state callbacks Andreas Färber
2011-06-14  2:37                                     ` [Qemu-devel] [RFC v5 19/23] prep: Add pc87312 Super I/O emulation Andreas Färber
2011-06-14  2:37                                       ` [Qemu-devel] [RFC 20/23] 40p: Add the Super I/O chip (pc87312) Andreas Färber
2011-06-14  2:37                                         ` Andreas Färber [this message]
2011-06-14  2:37                                           ` [Qemu-devel] [RFC 22/23] prep: qdev'ify System I/O (WIP) Andreas Färber
2011-06-14  2:37                                             ` [Qemu-devel] [RFC 23/23] 40p: Add an 8514/A graphics card Andreas Färber
2011-06-15  4:33                                               ` Roy Tam
2011-06-15 18:11                                                 ` Andreas Färber
2011-06-16  0:02                                                   ` [Qemu-devel] [RFC v2 23/23] 40p: Add an IBM " Andreas Färber
2011-06-18 20:42                                                     ` Blue Swirl
2011-06-19 10:04                                                       ` Andreas Färber
2011-06-19 12:10                                                         ` Hervé Poussineau
2011-06-19 13:27                                                         ` Blue Swirl
2011-06-19 18:40                                                           ` Andreas Färber
2011-06-19 19:03                                                             ` Blue Swirl
2011-06-19 21:38                                                               ` Andreas Färber
2011-06-19 21:43                                                                 ` [Qemu-devel] [RFC v3 " Andreas Färber
2011-06-16  0:05                                                   ` [Qemu-devel] [RFC 23/23] 40p: Add an " Andreas Färber
2011-06-16  1:22                                                   ` Roy Tam

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=1308019077-61957-22-git-send-email-andreas.faerber@web.de \
    --to=andreas.faerber@web.de \
    --cc=hpoussin@reactos.org \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).