vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pxa2xx_pcmcia.c: convert io memory space to memory API 

Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
master
Benoît Canet 2011-10-30 14:50:14 +01:00 committed by Avi Kivity
parent 4beeaa718c
commit 59aee13c82
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/pxa2xx_pcmcia.c
View File

@ -17,6 +17,7 @@ struct PXA2xxPCMCIAState {
PCMCIACardState *card; PCMCIACardState *card;
MemoryRegion common_iomem; MemoryRegion common_iomem;
MemoryRegion attr_iomem; MemoryRegion attr_iomem;
MemoryRegion iomem;
qemu_irq irq; qemu_irq irq;
qemu_irq cd_irq; qemu_irq cd_irq;
@ -66,8 +67,8 @@ static void pxa2xx_pcmcia_attr_write(void *opaque, target_phys_addr_t offset,
} }
} }
static uint32_t pxa2xx_pcmcia_io_read(void *opaque, static uint64_t pxa2xx_pcmcia_io_read(void *opaque,
target_phys_addr_t offset) target_phys_addr_t offset, unsigned size)
{ {
PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque; PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
@ -78,8 +79,8 @@ static uint32_t pxa2xx_pcmcia_io_read(void *opaque,
return 0; return 0;
} }
static void pxa2xx_pcmcia_io_write(void *opaque, static void pxa2xx_pcmcia_io_write(void *opaque, target_phys_addr_t offset,
target_phys_addr_t offset, uint32_t value) uint64_t value, unsigned size)
{ {
PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque; PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
@ -100,16 +101,10 @@ static const MemoryRegionOps pxa2xx_pcmcia_attr_ops = {
.endianness = DEVICE_NATIVE_ENDIAN .endianness = DEVICE_NATIVE_ENDIAN
}; };
static CPUReadMemoryFunc * const pxa2xx_pcmcia_io_readfn[] = { static const MemoryRegionOps pxa2xx_pcmcia_io_ops = {
pxa2xx_pcmcia_io_read, .read = pxa2xx_pcmcia_io_read,
pxa2xx_pcmcia_io_read, .write = pxa2xx_pcmcia_io_write,
pxa2xx_pcmcia_io_read, .endianness = DEVICE_NATIVE_ENDIAN
};
static CPUWriteMemoryFunc * const pxa2xx_pcmcia_io_writefn[] = {
pxa2xx_pcmcia_io_write,
pxa2xx_pcmcia_io_write,
pxa2xx_pcmcia_io_write,
}; };
static void pxa2xx_pcmcia_set_irq(void *opaque, int line, int level) static void pxa2xx_pcmcia_set_irq(void *opaque, int line, int level)
@ -124,16 +119,16 @@ static void pxa2xx_pcmcia_set_irq(void *opaque, int line, int level)
PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem, PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem,
target_phys_addr_t base) target_phys_addr_t base)
{ {
int iomemtype;
PXA2xxPCMCIAState *s; PXA2xxPCMCIAState *s;
s = (PXA2xxPCMCIAState *) s = (PXA2xxPCMCIAState *)
g_malloc0(sizeof(PXA2xxPCMCIAState)); g_malloc0(sizeof(PXA2xxPCMCIAState));
/* Socket I/O Memory Space */ /* Socket I/O Memory Space */
iomemtype = cpu_register_io_memory(pxa2xx_pcmcia_io_readfn, memory_region_init_io(&s->iomem, &pxa2xx_pcmcia_io_ops, s,
pxa2xx_pcmcia_io_writefn, s, DEVICE_NATIVE_ENDIAN); "pxa2xx-pcmcia-io", 0x04000000);
cpu_register_physical_memory(base | 0x00000000, 0x04000000, iomemtype); memory_region_add_subregion(sysmem, base | 0x00000000,
&s->iomem);
/* Then next 64 MB is reserved */ /* Then next 64 MB is reserved */