[Qemu-devel] [RFC 21/23] 40p: Add an audio card and a keyboard

[Andreas Färber]

From: Hervé Poussineau <address@hidden>

Signed-off-by: Hervé Poussineau <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
 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