cuda: rename frequency property to tb_frequency
This allows us to more easily differentiate between the timebase frequency used to calibrate the MacOS timers and the actual frequency of the hardware clock as indicated by CUDA_TIMER_FREQ. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> [dwg: Revert some extraneous changes which break compile] Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
e9fa3bf810
commit
27c5cee1c3
|
@ -179,7 +179,7 @@ static void set_counter(CUDAState *s, CUDATimer *ti, unsigned int val)
|
||||||
{
|
{
|
||||||
CUDA_DPRINTF("T%d.counter=%d\n", 1 + ti->index, val);
|
CUDA_DPRINTF("T%d.counter=%d\n", 1 + ti->index, val);
|
||||||
ti->load_time = get_tb(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL),
|
ti->load_time = get_tb(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL),
|
||||||
s->frequency);
|
s->tb_frequency);
|
||||||
ti->counter_value = val;
|
ti->counter_value = val;
|
||||||
cuda_timer_update(s, ti, ti->load_time);
|
cuda_timer_update(s, ti, ti->load_time);
|
||||||
}
|
}
|
||||||
|
@ -879,7 +879,7 @@ static void cuda_realizefn(DeviceState *dev, Error **errp)
|
||||||
struct tm tm;
|
struct tm tm;
|
||||||
|
|
||||||
s->timers[0].timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_timer1, s);
|
s->timers[0].timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_timer1, s);
|
||||||
s->timers[0].frequency = s->frequency;
|
s->timers[0].frequency = s->tb_frequency;
|
||||||
s->timers[1].timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_timer2, s);
|
s->timers[1].timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_timer2, s);
|
||||||
s->timers[1].frequency = (SCALE_US * 6000) / 4700;
|
s->timers[1].frequency = (SCALE_US * 6000) / 4700;
|
||||||
|
|
||||||
|
@ -910,7 +910,7 @@ static void cuda_initfn(Object *obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
static Property cuda_properties[] = {
|
static Property cuda_properties[] = {
|
||||||
DEFINE_PROP_UINT64("frequency", CUDAState, frequency, 0),
|
DEFINE_PROP_UINT64("timebase-frequency", CUDAState, tb_frequency, 0),
|
||||||
DEFINE_PROP_END_OF_LIST()
|
DEFINE_PROP_END_OF_LIST()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -451,7 +451,7 @@ void macio_init(PCIDevice *d,
|
||||||
macio_state->escc_mem = escc_mem;
|
macio_state->escc_mem = escc_mem;
|
||||||
/* Note: this code is strongly inspirated from the corresponding code
|
/* Note: this code is strongly inspirated from the corresponding code
|
||||||
in PearPC */
|
in PearPC */
|
||||||
qdev_prop_set_uint64(DEVICE(&macio_state->cuda), "frequency",
|
qdev_prop_set_uint64(DEVICE(&macio_state->cuda), "timebase-frequency",
|
||||||
macio_state->frequency);
|
macio_state->frequency);
|
||||||
|
|
||||||
qdev_init_nofail(DEVICE(d));
|
qdev_init_nofail(DEVICE(d));
|
||||||
|
|
|
@ -99,7 +99,7 @@ typedef struct CUDAState {
|
||||||
CUDATimer timers[2];
|
CUDATimer timers[2];
|
||||||
|
|
||||||
uint32_t tick_offset;
|
uint32_t tick_offset;
|
||||||
uint64_t frequency;
|
uint64_t tb_frequency;
|
||||||
|
|
||||||
uint8_t last_b;
|
uint8_t last_b;
|
||||||
uint8_t last_acr;
|
uint8_t last_acr;
|
||||||
|
|
Loading…
Reference in a new issue