ARMv7-M SysTick fix.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3727 c046a42c-6fe2-441c-8c8c-71466251a162
diff --git a/hw/stellaris.c b/hw/stellaris.c
index b7a0374..7936e0c 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -42,10 +42,6 @@
/* General purpose timer module. */
-/* Multiplication factor to convert from GPTM timer ticks to qemu timer
- ticks. */
-static int stellaris_clock_scale;
-
typedef struct gptm_state {
uint32_t config;
uint32_t mode[2];
@@ -90,7 +86,7 @@
/* 32-bit CountDown. */
uint32_t count;
count = s->load[0] | (s->load[1] << 16);
- tick += (int64_t)count * stellaris_clock_scale;
+ tick += (int64_t)count * system_clock_scale;
} else if (s->config == 1) {
/* 32-bit RTC. 1Hz tick. */
tick += ticks_per_sec;
@@ -480,7 +476,7 @@
s->int_status |= (1 << 6);
}
s->rcc = value;
- stellaris_clock_scale = 5 * (((s->rcc >> 23) & 0xf) + 1);
+ system_clock_scale = 5 * (((s->rcc >> 23) & 0xf) + 1);
break;
case 0x100: /* RCGC0 */
s->rcgc[0] = value;