[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/11] syborg_keyboard: convert to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 06/11] syborg_keyboard: convert to memory API |
Date: |
Tue, 25 Oct 2011 12:32:39 +0200 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/syborg_keyboard.c | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/hw/syborg_keyboard.c b/hw/syborg_keyboard.c
index 82b9dc0..03d2183 100644
--- a/hw/syborg_keyboard.c
+++ b/hw/syborg_keyboard.c
@@ -51,6 +51,7 @@ enum {
typedef struct {
SysBusDevice busdev;
+ MemoryRegion iomem;
uint32_t int_enabled;
int extension_bit;
uint32_t fifo_size;
@@ -66,7 +67,8 @@ static void syborg_keyboard_update(SyborgKeyboardState *s)
qemu_set_irq(s->irq, level);
}
-static uint32_t syborg_keyboard_read(void *opaque, target_phys_addr_t offset)
+static uint64_t syborg_keyboard_read(void *opaque, target_phys_addr_t offset,
+ unsigned size)
{
SyborgKeyboardState *s = (SyborgKeyboardState *)opaque;
int c;
@@ -104,7 +106,7 @@ static uint32_t syborg_keyboard_read(void *opaque,
target_phys_addr_t offset)
}
static void syborg_keyboard_write(void *opaque, target_phys_addr_t offset,
- uint32_t value)
+ uint64_t value, unsigned size)
{
SyborgKeyboardState *s = (SyborgKeyboardState *)opaque;
@@ -121,16 +123,10 @@ static void syborg_keyboard_write(void *opaque,
target_phys_addr_t offset,
}
}
-static CPUReadMemoryFunc * const syborg_keyboard_readfn[] = {
- syborg_keyboard_read,
- syborg_keyboard_read,
- syborg_keyboard_read
-};
-
-static CPUWriteMemoryFunc * const syborg_keyboard_writefn[] = {
- syborg_keyboard_write,
- syborg_keyboard_write,
- syborg_keyboard_write
+static const MemoryRegionOps syborg_keyboard_ops = {
+ .read = syborg_keyboard_read,
+ .write = syborg_keyboard_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static void syborg_keyboard_event(void *opaque, int keycode)
@@ -184,13 +180,11 @@ static const VMStateDescription vmstate_syborg_keyboard =
{
static int syborg_keyboard_init(SysBusDevice *dev)
{
SyborgKeyboardState *s = FROM_SYSBUS(SyborgKeyboardState, dev);
- int iomemtype;
sysbus_init_irq(dev, &s->irq);
- iomemtype = cpu_register_io_memory(syborg_keyboard_readfn,
- syborg_keyboard_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, 0x1000, iomemtype);
+ memory_region_init_io(&s->iomem, &syborg_keyboard_ops, s,
+ "keyboard", 0x1000);
+ sysbus_init_mmio_region(dev, &s->iomem);
if (s->fifo_size <= 0) {
fprintf(stderr, "syborg_keyboard: fifo too small\n");
s->fifo_size = 16;
--
1.7.5.4
- [Qemu-devel] [PATCH 00/11] V3 arm memory API conversion, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 01/11] integratorcp: convert control to sysbus, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 02/11] marvell_88x8618_audio: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 03/11] mst_fpga: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 04/11] syborg_fb: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 05/11] syborg_interrupt: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 06/11] syborg_keyboard: convert to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH 07/11] syborg_pointer: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 10/11] syborg_timer: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 11/11] syborg_virtio: convert to memory API, Benoît Canet, 2011/10/25
- Re: [Qemu-devel] [PATCH 00/11] V3 arm memory API conversion, Avi Kivity, 2011/10/25
- [Qemu-devel] [PATCH 09/11] syborg_serial: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 08/11] syborg_rtc: convert to memory API, Benoît Canet, 2011/10/25