diff options
Diffstat (limited to 'hw/slavio_timer.c')
| -rw-r--r-- | hw/slavio_timer.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c index 43f59d2750..47d538529e 100644 --- a/hw/slavio_timer.c +++ b/hw/slavio_timer.c @@ -1,7 +1,7 @@ /* * QEMU Sparc SLAVIO timer controller emulation * - * Copyright (c) 2003-2004 Fabrice Bellard + * Copyright (c) 2003-2005 Fabrice Bellard * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,6 +25,13 @@ //#define DEBUG_TIMER +#ifdef DEBUG_TIMER +#define DPRINTF(fmt, args...) \ +do { printf("TIMER: " fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) +#endif + /* * Registers of hardware timer in sun4m. * @@ -90,9 +97,8 @@ static void slavio_timer_get_out(SLAVIO_TIMERState *s) // Convert remaining counter ticks to CPU ticks s->expire_time = ticks + muldiv64(limit - count, ticks_per_sec, CNT_FREQ); -#ifdef DEBUG_TIMER - term_printf("timer: irq %d limit %d reached %d d %lld count %d s->c %x diff %lld stopped %d mode %d\n", s->irq, limit, s->reached?1:0, (ticks-s->count_load_time), count, s->count, s->expire_time - ticks, s->stopped, s->mode); -#endif + DPRINTF("irq %d limit %d reached %d d %lld count %d s->c %x diff %lld stopped %d mode %d\n", s->irq, limit, s->reached?1:0, (ticks-s->count_load_time), count, s->count, s->expire_time - ticks, s->stopped, s->mode); + if (s->mode != 1) pic_set_irq(s->irq, out); } |