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

Use a QEMUBH when an OMAP timer must expire immediately.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5265 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-09-20 01:32:07 +00:00
parent c9a33054bf
commit e856f2ad01
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/omap1.c
View File

@ -664,6 +664,7 @@ struct omap_mpu_timer_s {
uint32_t val; uint32_t val;
int64_t time; int64_t time;
QEMUTimer *timer; QEMUTimer *timer;
QEMUBH *tick;
int64_t rate; int64_t rate;
int it_ena; int it_ena;
@ -708,21 +709,15 @@ static inline void omap_timer_update(struct omap_mpu_timer_s *timer)
* ticks. */ * ticks. */
if (expires > (ticks_per_sec >> 10) || timer->ar) if (expires > (ticks_per_sec >> 10) || timer->ar)
qemu_mod_timer(timer->timer, timer->time + expires); qemu_mod_timer(timer->timer, timer->time + expires);
else { else
timer->val = 0; qemu_bh_schedule(timer->tick);
timer->st = 0;
if (timer->it_ena)
/* Edge-triggered irq */
qemu_irq_pulse(timer->irq);
}
} else } else
qemu_del_timer(timer->timer); qemu_del_timer(timer->timer);
} }
static void omap_timer_tick(void *opaque) static void omap_timer_fire(void *opaque)
{ {
struct omap_mpu_timer_s *timer = (struct omap_mpu_timer_s *) opaque; struct omap_mpu_timer_s *timer = opaque;
omap_timer_sync(timer);
if (!timer->ar) { if (!timer->ar) {
timer->val = 0; timer->val = 0;
@ -732,6 +727,14 @@ static void omap_timer_tick(void *opaque)
if (timer->it_ena) if (timer->it_ena)
/* Edge-triggered irq */ /* Edge-triggered irq */
qemu_irq_pulse(timer->irq); qemu_irq_pulse(timer->irq);
}
static void omap_timer_tick(void *opaque)
{
struct omap_mpu_timer_s *timer = (struct omap_mpu_timer_s *) opaque;
omap_timer_sync(timer);
omap_timer_fire(timer);
omap_timer_update(timer); omap_timer_update(timer);
} }
@ -835,6 +838,7 @@ struct omap_mpu_timer_s *omap_mpu_timer_init(target_phys_addr_t base,
s->clk = clk; s->clk = clk;
s->base = base; s->base = base;
s->timer = qemu_new_timer(vm_clock, omap_timer_tick, s); s->timer = qemu_new_timer(vm_clock, omap_timer_tick, s);
s->tick = qemu_bh_new(omap_timer_fire, s);
omap_mpu_timer_reset(s); omap_mpu_timer_reset(s);
omap_timer_clk_setup(s); omap_timer_clk_setup(s);