[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 21/23] 40p: Add an audio card and a keyboard
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC 21/23] 40p: Add an audio card and a keyboard |
Date: |
Tue, 14 Jun 2011 04:37:55 +0200 |
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
- [Qemu-devel] [RFC v5 11/23] isa: Allow to un-assign I/O ports, (continued)
- [Qemu-devel] [RFC v5 11/23] isa: Allow to un-assign I/O ports, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 12/23] isa: Allow to un-associate an IRQ, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 13/23] parallel: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 14/23] serial: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 15/23] fdc: Parametrize ISA base, IRQ and DMA, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 16/23] fdc: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 17/23] ide: Allow to discard I/O ports, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 18/23] ide: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 19/23] prep: Add pc87312 Super I/O emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 20/23] 40p: Add the Super I/O chip (pc87312), Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 21/23] 40p: Add an audio card and a keyboard,
Andreas Färber <=
- [Qemu-devel] [RFC 22/23] prep: qdev'ify System I/O (WIP), Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 23/23] 40p: Add an 8514/A graphics card, Andreas Färber, 2011/06/13
- Re: [Qemu-devel] [RFC 23/23] 40p: Add an 8514/A graphics card, Roy Tam, 2011/06/15
- Re: [Qemu-devel] [RFC 23/23] 40p: Add an 8514/A graphics card, Andreas Färber, 2011/06/15
- [Qemu-devel] [RFC v2 23/23] 40p: Add an IBM 8514/A graphics card, Andreas Färber, 2011/06/15
- Re: [Qemu-devel] [RFC v2 23/23] 40p: Add an IBM 8514/A graphics card, Blue Swirl, 2011/06/18
- Re: [Qemu-devel] [RFC v2 23/23] 40p: Add an IBM 8514/A graphics card, Andreas Färber, 2011/06/19
- Re: [Qemu-devel] [RFC v2 23/23] 40p: Add an IBM 8514/A graphics card, Hervé Poussineau, 2011/06/19
- Re: [Qemu-devel] [RFC v2 23/23] 40p: Add an IBM 8514/A graphics card, Blue Swirl, 2011/06/19
- Re: [Qemu-devel] [RFC v2 23/23] 40p: Add an IBM 8514/A graphics card, Andreas Färber, 2011/06/19