aboutsummaryrefslogtreecommitdiff
path: root/hw/twl92230.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/twl92230.c')
-rw-r--r--hw/twl92230.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/twl92230.c b/hw/twl92230.c
index ad49eac0d8..ddb6a2165c 100644
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -54,7 +54,7 @@ struct menelaus_s {
struct {
uint8_t ctrl;
uint16_t comp;
- QEMUTimer *hz;
+ QEMUTimer *hz_tm;
int64_t next;
struct tm tm;
struct tm new;
@@ -77,12 +77,12 @@ static inline void menelaus_update(struct menelaus_s *s)
static inline void menelaus_rtc_start(struct menelaus_s *s)
{
s->rtc.next =+ qemu_get_clock(rt_clock);
- qemu_mod_timer(s->rtc.hz, s->rtc.next);
+ qemu_mod_timer(s->rtc.hz_tm, s->rtc.next);
}
static inline void menelaus_rtc_stop(struct menelaus_s *s)
{
- qemu_del_timer(s->rtc.hz);
+ qemu_del_timer(s->rtc.hz_tm);
s->rtc.next =- qemu_get_clock(rt_clock);
if (s->rtc.next < 1)
s->rtc.next = 1;
@@ -106,7 +106,7 @@ static void menelaus_rtc_hz(void *opaque)
s->rtc.next_comp --;
s->rtc.alm_sec --;
s->rtc.next += 1000;
- qemu_mod_timer(s->rtc.hz, s->rtc.next);
+ qemu_mod_timer(s->rtc.hz_tm, s->rtc.next);
if ((s->rtc.ctrl >> 3) & 3) { /* EVERY */
menelaus_rtc_update(s);
if (((s->rtc.ctrl >> 3) & 3) == 1 && !s->rtc.tm.tm_sec)
@@ -886,7 +886,7 @@ i2c_slave *twl92230_init(i2c_bus *bus, qemu_irq irq)
s->i2c.send = menelaus_tx;
s->irq = irq;
- s->rtc.hz = qemu_new_timer(rt_clock, menelaus_rtc_hz, s);
+ s->rtc.hz_tm = qemu_new_timer(rt_clock, menelaus_rtc_hz, s);
s->in = qemu_allocate_irqs(menelaus_gpio_set, s, 3);
s->pwrbtn = qemu_allocate_irqs(menelaus_pwrbtn_set, s, 1)[0];