From patchwork Thu Sep 23 22:49:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Finn Thain X-Patchwork-Id: 12513781 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A62BDC433EF for ; Fri, 24 Sep 2021 00:06:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A193601FF for ; Fri, 24 Sep 2021 00:06:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6A193601FF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-m68k.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:33526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTYjg-0004qA-KM for qemu-devel@archiver.kernel.org; Thu, 23 Sep 2021 20:06:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTYgY-0001Yd-NI; Thu, 23 Sep 2021 20:03:26 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:55571) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTYgX-0005hU-9Q; Thu, 23 Sep 2021 20:03:26 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8E47C5C0198; Thu, 23 Sep 2021 20:03:24 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 23 Sep 2021 20:03:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=awM8pk8gaVSbYY5eRoZM+BPdO/qswv9VHADonsYx1 UU=; b=Kz13H3ajCrjx2RiYkW1BfpHj7Jxac7vLRd2P9vcPbBaJtYBUm09A7B7/Q gQGGc6WVXztmJgW6LH2pUE4pPqESfY7ngWxmwhMbYeFL85cBy/LkUavwBjVXUHIU kVa/cJJvoZ7YZFcpjJOc0pxXZ/bSmKQYn3wS2uwOxamrkg4yE0+eHC/cKrMDana2 +SDKVcahlLuSQUClAB36uFcD5QYcQDAPbMdgcuDdxnLSX23ujPhKjltPRqnuXYhp BU/HvzGdxdskE/7OC3nnXiT8RKz5rZ5s9VK3JbOaoYL+Kni8Zm8F+Tf5gz5pJV0H RIfNsGT329Gy0gFuymDU0HxJlMNAw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudejtddgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepvffkjghfhffugggtgfffsehtkeertddttdejnecuhfhrohhmpefhihhnnhcu vfhhrghinhcuoehfthhhrghinheslhhinhhugidqmheikehkrdhorhhgqeenucggtffrrg htthgvrhhnpeeuvdevtdelfeelffdufeefteeukeektdfgieeugffhveetteevhfdvieej tdfhleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hfthhhrghinheslhhinhhugidqmheikehkrdhorhhg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 23 Sep 2021 20:03:22 -0400 (EDT) To: Mark Cave-Ayland , Greg Kurz Message-Id: <8a347c38dda92fa7ff42a88cb20a2ffae95bffc1.1632437396.git.fthain@linux-m68k.org> In-Reply-To: References: From: Finn Thain Subject: [PATCH v1 2/9] hw/mos6522: Remove get_counter_value() methods and functions MIME-Version: 1.0 Date: Fri, 24 Sep 2021 08:49:56 +1000 Received-SPF: none client-ip=66.111.4.29; envelope-from=fthain@linux-m68k.org; helo=out5-smtp.messagingengine.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, Laurent Vivier , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This code appears to be unnecessary. Signed-off-by: Finn Thain Reviewed-by: Philippe Mathieu-Daudé --- 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 = {