summary refs log tree commit diff stats
path: root/hw/rc4030.c
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-11-12 17:36:08 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-11-12 17:36:08 +0000
commitb0f74c87a1dbd6b0c5e4de7f1c5cb40197e3fbe9 (patch)
tree91fe628b61c16ec0931fa7f7877aeff2d5768986 /hw/rc4030.c
parentc89068455d8ce6a169c9e3e0f5c94d2658933fda (diff)
downloadfocaccia-qemu-b0f74c87a1dbd6b0c5e4de7f1c5cb40197e3fbe9.tar.gz
focaccia-qemu-b0f74c87a1dbd6b0c5e4de7f1c5cb40197e3fbe9.zip
Don't use "hz" in identifiers to make AIX happy.
malc found AIX headers leak "hz" and so it can't be used there.  Change
the occurences in hw/.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5709 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/rc4030.c')
-rw-r--r--hw/rc4030.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/rc4030.c b/hw/rc4030.c
index bf440db73e..0384cf2722 100644
--- a/hw/rc4030.c
+++ b/hw/rc4030.c
@@ -70,11 +70,11 @@ typedef struct rc4030State
 static void set_next_tick(rc4030State *s)
 {
     qemu_irq_lower(s->timer_irq);
-    uint32_t hz;
+    uint32_t tm_hz;
 
-    hz = 1000 / (s->itr + 1);
+    tm_hz = 1000 / (s->itr + 1);
 
-    qemu_mod_timer(s->periodic_timer, qemu_get_clock(vm_clock) + ticks_per_sec / hz);
+    qemu_mod_timer(s->periodic_timer, qemu_get_clock(vm_clock) + ticks_per_sec / tm_hz);
 }
 
 /* called for accesses to rc4030 */