OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

zaurus: convert to memory API 

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-10-06 17:37:49 +02:00
parent 63858cd992
commit e71ceafc7d
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/zaurus.c
View File

@ -28,6 +28,7 @@ typedef struct ScoopInfo ScoopInfo;
struct ScoopInfo {
SysBusDevice busdev;
qemu_irq handler[16];
MemoryRegion iomem;
uint16_t status;
uint16_t power;
uint32_t gpio_level;
@ -67,7 +68,8 @@ static inline void scoop_gpio_handler_update(ScoopInfo *s) {
s->prev_level = level;
}
static uint32_t scoop_readb(void *opaque, target_phys_addr_t addr)
static uint64_t scoop_read(void *opaque, target_phys_addr_t addr,
unsigned size)
{
ScoopInfo *s = (ScoopInfo *) opaque;
@ -100,7 +102,8 @@ static uint32_t scoop_readb(void *opaque, target_phys_addr_t addr)
return 0;
}
static void scoop_writeb(void *opaque, target_phys_addr_t addr, uint32_t value)
static void scoop_write(void *opaque, target_phys_addr_t addr,
uint64_t value, unsigned size)
{
ScoopInfo *s = (ScoopInfo *) opaque;
value &= 0xffff;
@ -143,15 +146,10 @@ static void scoop_writeb(void *opaque, target_phys_addr_t addr, uint32_t value)
}
}
static CPUReadMemoryFunc * const scoop_readfn[] = {
scoop_readb,
scoop_readb,
scoop_readb,
};
static CPUWriteMemoryFunc * const scoop_writefn[] = {
scoop_writeb,
scoop_writeb,
scoop_writeb,
static const MemoryRegionOps scoop_ops = {
.read = scoop_read,
.write = scoop_write,
.endianness = DEVICE_NATIVE_ENDIAN,
};
static void scoop_gpio_set(void *opaque, int line, int level)
@ -167,15 +165,13 @@ static void scoop_gpio_set(void *opaque, int line, int level)
static int scoop_init(SysBusDevice *dev)
{
ScoopInfo *s = FROM_SYSBUS(ScoopInfo, dev);
int iomemtype;
s->status = 0x02;
qdev_init_gpio_out(&s->busdev.qdev, s->handler, 16);
qdev_init_gpio_in(&s->busdev.qdev, scoop_gpio_set, 16);
iomemtype = cpu_register_io_memory(scoop_readfn,
scoop_writefn, s, DEVICE_NATIVE_ENDIAN);
memory_region_init_io(&s->iomem, &scoop_ops, s, "scoop", 0x1000);
sysbus_init_mmio(dev, 0x1000, iomemtype);
sysbus_init_mmio_region(dev, &s->iomem);
return 0;
}