[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/9] pxa2xx_keypad: convert to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 5/9] pxa2xx_keypad: convert to memory API |
Date: |
Sun, 30 Oct 2011 14:50:15 +0100 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/pxa.h | 5 +++--
hw/pxa2xx.c | 2 +-
hw/pxa2xx_keypad.c | 34 +++++++++++++++-------------------
3 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/hw/pxa.h b/hw/pxa.h
index fe99a50..2732f8f 100644
--- a/hw/pxa.h
+++ b/hw/pxa.h
@@ -105,8 +105,9 @@ struct keymap {
int row;
};
typedef struct PXA2xxKeyPadState PXA2xxKeyPadState;
-PXA2xxKeyPadState *pxa27x_keypad_init(target_phys_addr_t base,
- qemu_irq irq);
+PXA2xxKeyPadState *pxa27x_keypad_init(MemoryRegion *sysmem,
+ target_phys_addr_t base,
+ qemu_irq irq);
void pxa27x_register_keypad(PXA2xxKeyPadState *kp, struct keymap *map,
int size);
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c
index 27afd8d..72b054c 100644
--- a/hw/pxa2xx.c
+++ b/hw/pxa2xx.c
@@ -2146,7 +2146,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space,
qdev_get_gpio_in(s->dma, PXA2XX_RX_RQ_I2S),
qdev_get_gpio_in(s->dma, PXA2XX_TX_RQ_I2S));
- s->kp = pxa27x_keypad_init(0x41500000,
+ s->kp = pxa27x_keypad_init(address_space, 0x41500000,
qdev_get_gpio_in(s->pic, PXA2XX_PIC_KEYPAD));
/* GPIO1 resets the processor */
diff --git a/hw/pxa2xx_keypad.c b/hw/pxa2xx_keypad.c
index e33959d..f86323f 100644
--- a/hw/pxa2xx_keypad.c
+++ b/hw/pxa2xx_keypad.c
@@ -80,6 +80,7 @@
#define PXAKBD_MAXCOL 8
struct PXA2xxKeyPadState {
+ MemoryRegion iomem;
qemu_irq irq;
struct keymap *map;
int pressed_cnt;
@@ -174,7 +175,8 @@ out:
return;
}
-static uint32_t pxa2xx_keypad_read(void *opaque, target_phys_addr_t offset)
+static uint64_t pxa2xx_keypad_read(void *opaque, target_phys_addr_t offset,
+ unsigned size)
{
PXA2xxKeyPadState *s = (PXA2xxKeyPadState *) opaque;
uint32_t tmp;
@@ -235,8 +237,8 @@ static uint32_t pxa2xx_keypad_read(void *opaque,
target_phys_addr_t offset)
return 0;
}
-static void pxa2xx_keypad_write(void *opaque,
- target_phys_addr_t offset, uint32_t value)
+static void pxa2xx_keypad_write(void *opaque, target_phys_addr_t offset,
+ uint64_t value, unsigned size)
{
PXA2xxKeyPadState *s = (PXA2xxKeyPadState *) opaque;
@@ -277,16 +279,10 @@ static void pxa2xx_keypad_write(void *opaque,
}
}
-static CPUReadMemoryFunc * const pxa2xx_keypad_readfn[] = {
- pxa2xx_keypad_read,
- pxa2xx_keypad_read,
- pxa2xx_keypad_read
-};
-
-static CPUWriteMemoryFunc * const pxa2xx_keypad_writefn[] = {
- pxa2xx_keypad_write,
- pxa2xx_keypad_write,
- pxa2xx_keypad_write
+static const MemoryRegionOps pxa2xx_keypad_ops = {
+ .read = pxa2xx_keypad_read,
+ .write = pxa2xx_keypad_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static const VMStateDescription vmstate_pxa2xx_keypad = {
@@ -306,18 +302,18 @@ static const VMStateDescription vmstate_pxa2xx_keypad = {
}
};
-PXA2xxKeyPadState *pxa27x_keypad_init(target_phys_addr_t base,
- qemu_irq irq)
+PXA2xxKeyPadState *pxa27x_keypad_init(MemoryRegion *sysmem,
+ target_phys_addr_t base,
+ qemu_irq irq)
{
- int iomemtype;
PXA2xxKeyPadState *s;
s = (PXA2xxKeyPadState *) g_malloc0(sizeof(PXA2xxKeyPadState));
s->irq = irq;
- iomemtype = cpu_register_io_memory(pxa2xx_keypad_readfn,
- pxa2xx_keypad_writefn, s, DEVICE_NATIVE_ENDIAN);
- cpu_register_physical_memory(base, 0x00100000, iomemtype);
+ memory_region_init_io(&s->iomem, &pxa2xx_keypad_ops, s,
+ "pxa2xx-keypad", 0x00100000);
+ memory_region_add_subregion(sysmem, base, &s->iomem);
vmstate_register(NULL, 0, &vmstate_pxa2xx_keypad, s);
--
1.7.5.4
- [Qemu-devel] [PATCH V2 0/9] pxa2xx: memory API conversions, Benoît Canet, 2011/10/30
- [Qemu-devel] [PATCH 1/9] pxa2xx_gpio: convert to memory API, Benoît Canet, 2011/10/30
- [Qemu-devel] [PATCH 2/9] pxa2xx_pcmcia.c: convert common memory space to memory API, Benoît Canet, 2011/10/30
- [Qemu-devel] [PATCH 3/9] pxa2xx_pcmcia.c: convert attribute memory space to memory API, Benoît Canet, 2011/10/30
- [Qemu-devel] [PATCH 4/9] pxa2xx_pcmcia.c: convert io memory space to memory API, Benoît Canet, 2011/10/30
- [Qemu-devel] [PATCH 5/9] pxa2xx_keypad: convert to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH 8/9] pxa2xx_mmci: convert to memory API., Benoît Canet, 2011/10/30
- [Qemu-devel] [PATCH 7/9] pxa2xx_pic: convert to memory API, Benoît Canet, 2011/10/30
- [Qemu-devel] [PATCH 9/9] pxa2xx_lcd: convert to memory API, Benoît Canet, 2011/10/30
- [Qemu-devel] [PATCH 6/9] pxa2xx_timer: convert to memory API, Benoît Canet, 2011/10/30
- Re: [Qemu-devel] [PATCH V2 0/9] pxa2xx: memory API conversions, Avi Kivity, 2011/10/30