[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 2/9] hw/mos6522: Remove get_counter_value() methods and functi
From: |
Finn Thain |
Subject: |
[PATCH v1 2/9] hw/mos6522: Remove get_counter_value() methods and functions |
Date: |
Fri, 24 Sep 2021 08:49:56 +1000 |
This code appears to be unnecessary.
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/misc/mos6522.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index a478c1ca43..ff246b5437 100644
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -52,23 +52,13 @@ static void mos6522_update_irq(MOS6522State *s)
}
}
-static uint64_t get_counter_value(MOS6522State *s, MOS6522Timer *ti)
-{
- MOS6522DeviceClass *mdc = MOS6522_GET_CLASS(s);
-
- if (ti->index == 0) {
- return mdc->get_timer1_counter_value(s, ti);
- } else {
- return mdc->get_timer2_counter_value(s, ti);
- }
-}
-
static unsigned int get_counter(MOS6522State *s, MOS6522Timer *ti)
{
int64_t d;
unsigned int counter;
- d = get_counter_value(s, ti);
+ d = muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - ti->load_time,
+ ti->frequency, NANOSECONDS_PER_SECOND);
if (ti->index == 0) {
/* the timer goes down from latch to -1 (period of latch + 2) */
@@ -191,12 +181,6 @@ static void mos6522_set_sr_int(MOS6522State *s)
mos6522_update_irq(s);
}
-static uint64_t mos6522_get_counter_value(MOS6522State *s, MOS6522Timer *ti)
-{
- return muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - ti->load_time,
- ti->frequency, NANOSECONDS_PER_SECOND);
-}
-
static void mos6522_portA_write(MOS6522State *s)
{
qemu_log_mask(LOG_UNIMP, "portA_write unimplemented\n");
@@ -498,8 +482,6 @@ static void mos6522_class_init(ObjectClass *oc, void *data)
mdc->portB_write = mos6522_portB_write;
mdc->portA_write = mos6522_portA_write;
mdc->update_irq = mos6522_update_irq;
- mdc->get_timer1_counter_value = mos6522_get_counter_value;
- mdc->get_timer2_counter_value = mos6522_get_counter_value;
}
static const TypeInfo mos6522_type_info = {
--
2.26.3
- [PATCH v1 0/9] hw/mos6522: VIA timer emulation fixes and improvements, Finn Thain, 2021/09/23
- [PATCH v1 1/9] hw/mos6522: Remove get_load_time() methods and functions, Finn Thain, 2021/09/23
- [PATCH v1 2/9] hw/mos6522: Remove get_counter_value() methods and functions,
Finn Thain <=
- [PATCH v1 3/9] hw/mos6522: Remove redundant mos6522_timer1_update() calls, Finn Thain, 2021/09/23
- [PATCH v1 4/9] hw/mos6522: Rename timer callback functions, Finn Thain, 2021/09/23
- [PATCH v1 5/9] hw/mos6522: Fix initial timer counter reload, Finn Thain, 2021/09/23
- [PATCH v1 6/9] hw/mos6522: Call mos6522_update_irq() when appropriate, Finn Thain, 2021/09/23
- [PATCH v1 7/9] hw/mos6522: Avoid using discrepant QEMU clock values, Finn Thain, 2021/09/23
- [PATCH v1 8/9] hw/mos6522: Synchronize timer interrupt and timer counter, Finn Thain, 2021/09/23
- [PATCH v1 9/9] hw/mos6522: Implement oneshot mode, Finn Thain, 2021/09/23