[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/10] pxa2xx_pcmcia.c: convert common memory space
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 02/10] pxa2xx_pcmcia.c: convert common memory space to memory API |
Date: |
Wed, 26 Oct 2011 16:56:28 +0200 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/pxa2xx_pcmcia.c | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/hw/pxa2xx_pcmcia.c b/hw/pxa2xx_pcmcia.c
index 74c6817..51ed72a 100644
--- a/hw/pxa2xx_pcmcia.c
+++ b/hw/pxa2xx_pcmcia.c
@@ -10,17 +10,19 @@
#include "hw.h"
#include "pcmcia.h"
#include "pxa.h"
+#include "exec-memory.h"
struct PXA2xxPCMCIAState {
PCMCIASocket slot;
PCMCIACardState *card;
+ MemoryRegion common_iomem;
qemu_irq irq;
qemu_irq cd_irq;
};
-static uint32_t pxa2xx_pcmcia_common_read(void *opaque,
- target_phys_addr_t offset)
+static uint64_t pxa2xx_pcmcia_common_read(void *opaque,
+ target_phys_addr_t offset, unsigned size)
{
PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
@@ -31,8 +33,8 @@ static uint32_t pxa2xx_pcmcia_common_read(void *opaque,
return 0;
}
-static void pxa2xx_pcmcia_common_write(void *opaque,
- target_phys_addr_t offset, uint32_t value)
+static void pxa2xx_pcmcia_common_write(void *opaque, target_phys_addr_t offset,
+ uint64_t value, unsigned size)
{
PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
@@ -85,16 +87,10 @@ static void pxa2xx_pcmcia_io_write(void *opaque,
}
}
-static CPUReadMemoryFunc * const pxa2xx_pcmcia_common_readfn[] = {
- pxa2xx_pcmcia_common_read,
- pxa2xx_pcmcia_common_read,
- pxa2xx_pcmcia_common_read,
-};
-
-static CPUWriteMemoryFunc * const pxa2xx_pcmcia_common_writefn[] = {
- pxa2xx_pcmcia_common_write,
- pxa2xx_pcmcia_common_write,
- pxa2xx_pcmcia_common_write,
+static const MemoryRegionOps pxa2xx_pcmcia_common_ops = {
+ .read = pxa2xx_pcmcia_common_read,
+ .write = pxa2xx_pcmcia_common_write,
+ .endianness = DEVICE_NATIVE_ENDIAN
};
static CPUReadMemoryFunc * const pxa2xx_pcmcia_attr_readfn[] = {
@@ -151,9 +147,10 @@ PXA2xxPCMCIAState *pxa2xx_pcmcia_init(target_phys_addr_t
base)
cpu_register_physical_memory(base | 0x08000000, 0x04000000, iomemtype);
/* Socket Common Memory Space */
- iomemtype = cpu_register_io_memory(pxa2xx_pcmcia_common_readfn,
- pxa2xx_pcmcia_common_writefn, s, DEVICE_NATIVE_ENDIAN);
- cpu_register_physical_memory(base | 0x0c000000, 0x04000000, iomemtype);
+ memory_region_init_io(&s->common_iomem, &pxa2xx_pcmcia_common_ops, s,
+ "pcmcia_common", 0x04000000);
+ memory_region_add_subregion(get_system_memory(), base | 0x0c000000,
+ &s->common_iomem);
if (base == 0x30000000)
s->slot.slot_string = "PXA PC Card Socket 1";
--
1.7.4.1
- [Qemu-devel] [PATCH 00/10] pxa2xx: memory API conversions, Benoît Canet, 2011/10/26
- [Qemu-devel] [PATCH 01/10] pxa2xx_gpio: convert to memory API, Benoît Canet, 2011/10/26
- [Qemu-devel] [PATCH 02/10] pxa2xx_pcmcia.c: convert common memory space to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH 03/10] pxa2xx_pcmcia.c: convert attribute memory space to memory API, Benoît Canet, 2011/10/26
- [Qemu-devel] [PATCH 04/10] pxa2xx_pcmcia.c: convert io memory space to memory API, Benoît Canet, 2011/10/26
- [Qemu-devel] [PATCH 05/10] pxa2xx_pcmcia.c: merge calls to get_system_memory(), Benoît Canet, 2011/10/26
- [Qemu-devel] [PATCH 07/10] pxa2xx_timer: convert to memory API, Benoît Canet, 2011/10/26
- [Qemu-devel] [PATCH 06/10] pxa2xx_keypad: convert to memory API, Benoît Canet, 2011/10/26
- [Qemu-devel] [PATCH 08/10] pxa2xx_pic: convert to memory API, Benoît Canet, 2011/10/26
- [Qemu-devel] [PATCH 09/10] pxa2xx_mmci: convert to memory API., Benoît Canet, 2011/10/26
- [Qemu-devel] [PATCH 10/10] pxa2xx_lcd: convert to memory API, Benoît Canet, 2011/10/26
- Re: [Qemu-devel] [PATCH 00/10] pxa2xx: memory API conversions, Avi Kivity, 2011/10/30