From: Finn Thain <fthain@linux-m68k.org>
To: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
Greg Kurz <groug@kaod.org>
Cc: qemu-ppc@nongnu.org, Laurent Vivier <laurent@vivier.eu>,
qemu-devel@nongnu.org
Subject: [PATCH v1 2/9] hw/mos6522: Remove get_counter_value() methods and functions
Date: Fri, 24 Sep 2021 08:49:56 +1000 [thread overview]
Message-ID: <8a347c38dda92fa7ff42a88cb20a2ffae95bffc1.1632437396.git.fthain@linux-m68k.org> (raw)
In-Reply-To: <cover.1632437396.git.fthain@linux-m68k.org>
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
next prev parent reply other threads:[~2021-09-24 0:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 22:49 [PATCH v1 0/9] hw/mos6522: VIA timer emulation fixes and improvements Finn Thain
2021-09-23 22:49 ` [PATCH v1 9/9] hw/mos6522: Implement oneshot mode Finn Thain
2021-09-23 22:49 ` [PATCH v1 1/9] hw/mos6522: Remove get_load_time() methods and functions Finn Thain
2021-09-23 22:49 ` [PATCH v1 8/9] hw/mos6522: Synchronize timer interrupt and timer counter Finn Thain
2021-09-23 22:49 ` [PATCH v1 7/9] hw/mos6522: Avoid using discrepant QEMU clock values Finn Thain
2021-09-23 22:49 ` [PATCH v1 4/9] hw/mos6522: Rename timer callback functions Finn Thain
2021-09-23 22:49 ` [PATCH v1 3/9] hw/mos6522: Remove redundant mos6522_timer1_update() calls Finn Thain
2021-09-23 22:49 ` [PATCH v1 6/9] hw/mos6522: Call mos6522_update_irq() when appropriate Finn Thain
2021-09-23 22:49 ` [PATCH v1 5/9] hw/mos6522: Fix initial timer counter reload Finn Thain
2021-09-23 22:49 ` Finn Thain [this message]
2021-11-17 3:03 ` [PATCH v1 0/9] hw/mos6522: VIA timer emulation fixes and improvements Finn Thain
2021-11-18 11:13 ` Mark Cave-Ayland
2021-11-19 8:39 ` Finn Thain
2021-11-20 21:53 ` Mark Cave-Ayland
2021-11-20 23:38 ` Finn Thain
2021-11-22 17:00 ` Peter Maydell
2021-11-22 22:34 ` Finn Thain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8a347c38dda92fa7ff42a88cb20a2ffae95bffc1.1632437396.git.fthain@linux-m68k.org \
--to=fthain@linux-m68k.org \
--cc=groug@kaod.org \
--cc=laurent@vivier.eu \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).