david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

omap_gp_timer: convert to memory API

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-11-24 14:32:34 +02:00
parent fcb40162bf
commit 9832b74c14
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/omap_gptimer.c
View File

@ -23,6 +23,7 @@
/* GP timers */ /* GP timers */
struct omap_gp_timer_s { struct omap_gp_timer_s {
MemoryRegion iomem;
qemu_irq irq; qemu_irq irq;
qemu_irq wkup; qemu_irq wkup;
qemu_irq in; qemu_irq in;
@ -337,12 +338,6 @@ static uint32_t omap_gp_timer_readh(void *opaque, target_phys_addr_t addr)
} }
} }
static CPUReadMemoryFunc * const omap_gp_timer_readfn[] = {
omap_badwidth_read32,
omap_gp_timer_readh,
omap_gp_timer_readw,
};
static void omap_gp_timer_write(void *opaque, target_phys_addr_t addr, static void omap_gp_timer_write(void *opaque, target_phys_addr_t addr,
uint32_t value) uint32_t value)
{ {
@ -454,16 +449,25 @@ static void omap_gp_timer_writeh(void *opaque, target_phys_addr_t addr,
s->writeh = (uint16_t) value; s->writeh = (uint16_t) value;
} }
static CPUWriteMemoryFunc * const omap_gp_timer_writefn[] = { static const MemoryRegionOps omap_gp_timer_ops = {
.old_mmio = {
.read = {
omap_badwidth_read32,
omap_gp_timer_readh,
omap_gp_timer_readw,
},
.write = {
omap_badwidth_write32, omap_badwidth_write32,
omap_gp_timer_writeh, omap_gp_timer_writeh,
omap_gp_timer_write, omap_gp_timer_write,
},
},
.endianness = DEVICE_NATIVE_ENDIAN,
}; };
struct omap_gp_timer_s *omap_gp_timer_init(struct omap_target_agent_s *ta, struct omap_gp_timer_s *omap_gp_timer_init(struct omap_target_agent_s *ta,
qemu_irq irq, omap_clk fclk, omap_clk iclk) qemu_irq irq, omap_clk fclk, omap_clk iclk)
{ {
int iomemtype;
struct omap_gp_timer_s *s = (struct omap_gp_timer_s *) struct omap_gp_timer_s *s = (struct omap_gp_timer_s *)
g_malloc0(sizeof(struct omap_gp_timer_s)); g_malloc0(sizeof(struct omap_gp_timer_s));
@ -476,9 +480,9 @@ struct omap_gp_timer_s *omap_gp_timer_init(struct omap_target_agent_s *ta,
omap_gp_timer_reset(s); omap_gp_timer_reset(s);
omap_gp_timer_clk_setup(s); omap_gp_timer_clk_setup(s);
iomemtype = cpu_register_io_memory(omap_gp_timer_readfn, memory_region_init_io(&s->iomem, &omap_gp_timer_ops, s, "omap.gptimer",
omap_gp_timer_writefn, s, DEVICE_NATIVE_ENDIAN); omap_l4_region_size(ta, 0));
omap_l4_attach(ta, 0, iomemtype); omap_l4_attach_region(ta, 0, &s->iomem);
return s; return s;
} }