[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/15] marvell_88x8618_audio: convert to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 01/15] marvell_88x8618_audio: convert to memory API |
Date: |
Mon, 24 Oct 2011 23:03:27 +0200 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/marvell_88w8618_audio.c | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/hw/marvell_88w8618_audio.c b/hw/marvell_88w8618_audio.c
index f8c5242..67bb70b 100644
--- a/hw/marvell_88w8618_audio.c
+++ b/hw/marvell_88w8618_audio.c
@@ -36,6 +36,7 @@
typedef struct mv88w8618_audio_state {
SysBusDevice busdev;
+ MemoryRegion iomem;
qemu_irq irq;
uint32_t playback_mode;
uint32_t status;
@@ -134,7 +135,8 @@ static void
mv88w8618_audio_clock_update(mv88w8618_audio_state *s)
wm8750_set_bclk_in(s->wm, rate);
}
-static uint32_t mv88w8618_audio_read(void *opaque, target_phys_addr_t offset)
+static uint64_t mv88w8618_audio_read(void *opaque, target_phys_addr_t offset,
+ unsigned size)
{
mv88w8618_audio_state *s = opaque;
@@ -160,7 +162,7 @@ static uint32_t mv88w8618_audio_read(void *opaque,
target_phys_addr_t offset)
}
static void mv88w8618_audio_write(void *opaque, target_phys_addr_t offset,
- uint32_t value)
+ uint64_t value, unsigned size)
{
mv88w8618_audio_state *s = opaque;
@@ -227,31 +229,23 @@ static void mv88w8618_audio_reset(DeviceState *d)
s->phys_buf = 0;
}
-static CPUReadMemoryFunc * const mv88w8618_audio_readfn[] = {
- mv88w8618_audio_read,
- mv88w8618_audio_read,
- mv88w8618_audio_read
-};
-
-static CPUWriteMemoryFunc * const mv88w8618_audio_writefn[] = {
- mv88w8618_audio_write,
- mv88w8618_audio_write,
- mv88w8618_audio_write
+static const MemoryRegionOps mv88w8618_audio_ops = {
+ .read = mv88w8618_audio_read,
+ .write = mv88w8618_audio_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static int mv88w8618_audio_init(SysBusDevice *dev)
{
mv88w8618_audio_state *s = FROM_SYSBUS(mv88w8618_audio_state, dev);
- int iomemtype;
sysbus_init_irq(dev, &s->irq);
wm8750_data_req_set(s->wm, mv88w8618_audio_callback, s);
- iomemtype = cpu_register_io_memory(mv88w8618_audio_readfn,
- mv88w8618_audio_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, MP_AUDIO_SIZE, iomemtype);
+ memory_region_init_io(&s->iomem, &mv88w8618_audio_ops, s,
+ "audio", MP_AUDIO_SIZE);
+ sysbus_init_mmio_region(dev, &s->iomem);
return 0;
}
--
1.7.4.1
- [Qemu-devel] (no subject), 王永博, 2011/10/24
- [Qemu-devel] (no subject), Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH V2 00/15] V2 arm: more memory API and VMState conversion, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 01/15] marvell_88x8618_audio: convert to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH 02/15] mst_fpga: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 04/15] syborg_interrupt: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 03/15] syborg_fb: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 05/15] syborg_keyboard: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 06/15] syborg_pointer: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 08/15] syborg_serial: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 10/15] syborg_virtio: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 11/15] pl181: add vmstate, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 14/15] integratorcp: convert integratorcm to VMState, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 15/15] integratorcp: convert icp_pic to VMState, Benoît Canet, 2011/10/24