int board_id, target_phys_addr_t loader_start);
/* armv7m_nvic.c */
+int system_clock_scale;
qemu_irq *armv7m_nvic_init(CPUState *env);
#endif /* !ARM_MISC_H */
s->cpu_enabled[i] = 0;
#endif
}
- for (i = 0; i < 15; i++) {
+ for (i = 0; i < 16; i++) {
GIC_SET_ENABLED(i);
GIC_SET_TRIGGER(i);
}
#define SYSTICK_CLKSOURCE (1 << 2)
#define SYSTICK_COUNTFLAG (1 << 16)
-/* Conversion factor from qemu timer to SysTick frequencies.
- QEMU uses a base of 1GHz, so these give 20MHz and 1MHz for core and
- reference frequencies. */
+/* Multiplication factor to convert from system clock ticks to qemu timer
+ ticks. */
+int system_clock_scale;
+/* Conversion factor from qemu timer to SysTick frequencies. */
static inline int64_t systick_scale(nvic_state *s)
{
if (s->systick.control & SYSTICK_CLKSOURCE)
- return 50;
+ return system_clock_scale;
else
return 1000;
}
/* 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];
/* 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;
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;