|
@@ -208,13 +208,6 @@ static void mos6522_timer2(void *opaque)
|
|
mos6522_update_irq(s);
|
|
mos6522_update_irq(s);
|
|
}
|
|
}
|
|
|
|
|
|
-static void mos6522_set_sr_int(MOS6522State *s)
|
|
|
|
-{
|
|
|
|
- trace_mos6522_set_sr_int();
|
|
|
|
- s->ifr |= SR_INT;
|
|
|
|
- mos6522_update_irq(s);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static uint64_t mos6522_get_counter_value(MOS6522State *s, MOS6522Timer *ti)
|
|
static uint64_t mos6522_get_counter_value(MOS6522State *s, MOS6522Timer *ti)
|
|
{
|
|
{
|
|
return muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - ti->load_time,
|
|
return muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - ti->load_time,
|
|
@@ -527,10 +520,8 @@ static void mos6522_class_init(ObjectClass *oc, void *data)
|
|
dc->vmsd = &vmstate_mos6522;
|
|
dc->vmsd = &vmstate_mos6522;
|
|
device_class_set_props(dc, mos6522_properties);
|
|
device_class_set_props(dc, mos6522_properties);
|
|
mdc->parent_reset = dc->reset;
|
|
mdc->parent_reset = dc->reset;
|
|
- mdc->set_sr_int = mos6522_set_sr_int;
|
|
|
|
mdc->portB_write = mos6522_portB_write;
|
|
mdc->portB_write = mos6522_portB_write;
|
|
mdc->portA_write = mos6522_portA_write;
|
|
mdc->portA_write = mos6522_portA_write;
|
|
- mdc->update_irq = mos6522_update_irq;
|
|
|
|
mdc->get_timer1_counter_value = mos6522_get_counter_value;
|
|
mdc->get_timer1_counter_value = mos6522_get_counter_value;
|
|
mdc->get_timer2_counter_value = mos6522_get_counter_value;
|
|
mdc->get_timer2_counter_value = mos6522_get_counter_value;
|
|
mdc->get_timer1_load_time = mos6522_get_load_time;
|
|
mdc->get_timer1_load_time = mos6522_get_load_time;
|