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

milkymist-sysctl: convert to memory API

Browse Source 
Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Michael Walle 2011-08-31 16:48:43 +02:00 committed by Avi Kivity
parent d46ccfcef3
commit dfa87ccfad
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/milkymist-sysctl.c
View File

@ -59,6 +59,7 @@ enum {
struct MilkymistSysctlState { struct MilkymistSysctlState {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion regs_region;
QEMUBH *bh0; QEMUBH *bh0;
QEMUBH *bh1; QEMUBH *bh1;
@ -88,7 +89,8 @@ static void sysctl_icap_write(MilkymistSysctlState *s, uint32_t value)
} }
} }
static uint32_t sysctl_read(void *opaque, target_phys_addr_t addr) static uint64_t sysctl_read(void *opaque, target_phys_addr_t addr,
unsigned size)
{ {
MilkymistSysctlState *s = opaque; MilkymistSysctlState *s = opaque;
uint32_t r = 0; uint32_t r = 0;
@ -129,7 +131,8 @@ static uint32_t sysctl_read(void *opaque, target_phys_addr_t addr)
return r; return r;
} }
static void sysctl_write(void *opaque, target_phys_addr_t addr, uint32_t value) static void sysctl_write(void *opaque, target_phys_addr_t addr, uint64_t value,
unsigned size)
{ {
MilkymistSysctlState *s = opaque; MilkymistSysctlState *s = opaque;
@ -195,16 +198,14 @@ static void sysctl_write(void *opaque, target_phys_addr_t addr, uint32_t value)
} }
} }
static CPUReadMemoryFunc * const sysctl_read_fn[] = { static const MemoryRegionOps sysctl_mmio_ops = {
NULL, .read = sysctl_read,
NULL, .write = sysctl_write,
&sysctl_read, .valid = {
}; .min_access_size = 4,
.max_access_size = 4,
static CPUWriteMemoryFunc * const sysctl_write_fn[] = { },
NULL, .endianness = DEVICE_NATIVE_ENDIAN,
NULL,
&sysctl_write,
}; };
static void timer0_hit(void *opaque) static void timer0_hit(void *opaque)
@ -258,7 +259,6 @@ static void milkymist_sysctl_reset(DeviceState *d)
static int milkymist_sysctl_init(SysBusDevice *dev) static int milkymist_sysctl_init(SysBusDevice *dev)
{ {
MilkymistSysctlState *s = FROM_SYSBUS(typeof(*s), dev); MilkymistSysctlState *s = FROM_SYSBUS(typeof(*s), dev);
int sysctl_regs;
sysbus_init_irq(dev, &s->gpio_irq); sysbus_init_irq(dev, &s->gpio_irq);
sysbus_init_irq(dev, &s->timer0_irq); sysbus_init_irq(dev, &s->timer0_irq);
@ -271,9 +271,9 @@ static int milkymist_sysctl_init(SysBusDevice *dev)
ptimer_set_freq(s->ptimer0, s->freq_hz); ptimer_set_freq(s->ptimer0, s->freq_hz);
ptimer_set_freq(s->ptimer1, s->freq_hz); ptimer_set_freq(s->ptimer1, s->freq_hz);
sysctl_regs = cpu_register_io_memory(sysctl_read_fn, sysctl_write_fn, s, memory_region_init_io(&s->regs_region, &sysctl_mmio_ops, s,
DEVICE_NATIVE_ENDIAN); "milkymist-sysctl", R_MAX * 4);
sysbus_init_mmio(dev, R_MAX * 4, sysctl_regs); sysbus_init_mmio_region(dev, &s->regs_region);
return 0; return 0;
} }