From nobody Tue Feb 10 21:59:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1592945852; cv=none; d=zohomail.com; s=zohoarc; b=THF9VrFw2c+ZtqrhmmKFh/RlCq8TbOmP7ffZVejEF0ueLmo39PieGeJZmPjX3lKIoRdctL1gjxuu1XAWaxuZ0W7jYXOWLQ6+zg4FGq8dx0C9Zdq8+4yVFWw+xNdUw0gJi5TBOtJXZpTm5NUCM4viCuX9p/v0l5fvUxqxGcdbFqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592945852; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HzkE7RX678xxfPK/j/4tobgV5V0zQN0cPGGybn+VPSo=; b=g7b0xnREWAclJVMvvpL8H0zwMsvoZLESECW3v0C++S/G65YLn+rgUB7Ttlmduz1J69I/HPmQpJj751pcBi9sM02qu/28hdrvfGKNU1lHhdvCP4nKb/yTdk/9oobnXHs3ZQwDJ3MdXmK6W+N1VoslmzBs1JPcsJ/kZ4tMlpeUtfE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592945852053136.60546551764378; Tue, 23 Jun 2020 13:57:32 -0700 (PDT) Received: from localhost ([::1]:33194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnpz0-00082M-Iv for importer@patchew.org; Tue, 23 Jun 2020 16:57:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnpt3-0005Vt-Km; Tue, 23 Jun 2020 16:51:23 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:56478 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnpt0-00029N-RV; Tue, 23 Jun 2020 16:51:21 -0400 Received: from host86-158-109-79.range86-158.btcentralplus.com ([86.158.109.79] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jnpsu-0007T1-SG; Tue, 23 Jun 2020 21:51:20 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, laurent@vivier.eu, fthain@telegraphics.com.au Date: Tue, 23 Jun 2020 21:49:32 +0100 Message-Id: <20200623204936.24064-19-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200623204936.24064-1-mark.cave-ayland@ilande.co.uk> References: <20200623204936.24064-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.158.109.79 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 18/22] mac_via: move VIA1 portB write logic into mos6522_q800_via1_write() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Currently the logic is split between the mos6522 portB_write() callback and the memory region used to capture the VIA1 MMIO accesses. Move everything into the latter mos6522_q800_via1_write() function to keep all the logic in one place to make it easier to follow. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Finn Thain --- hw/misc/mac_via.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 7a28bb37ac..a1dc00d9f6 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -801,11 +801,21 @@ static void mos6522_q800_via1_write(void *opaque, hwa= ddr addr, uint64_t val, unsigned size) { MOS6522Q800VIA1State *v1s =3D MOS6522_Q800_VIA1(opaque); + MacVIAState *m =3D container_of(v1s, MacVIAState, mos6522_via1); MOS6522State *ms =3D MOS6522(v1s); =20 addr =3D (addr >> 9) & 0xf; mos6522_write(ms, addr, val, size); =20 + switch (addr) { + case VIA_REG_B: + via1_rtc_update(m); + via1_adb_update(m); + + v1s->last_b =3D ms->b; + break; + } + via1_one_second_update(v1s); via1_VBL_update(v1s); } @@ -1037,18 +1047,6 @@ static TypeInfo mac_via_info =3D { }; =20 /* VIA 1 */ -static void mos6522_q800_via1_portB_write(MOS6522State *s) -{ - MOS6522Q800VIA1State *v1s =3D container_of(s, MOS6522Q800VIA1State, - parent_obj); - MacVIAState *m =3D container_of(v1s, MacVIAState, mos6522_via1); - - via1_rtc_update(m); - via1_adb_update(m); - - v1s->last_b =3D s->b; -} - static void mos6522_q800_via1_reset(DeviceState *dev) { MOS6522State *ms =3D MOS6522(dev); @@ -1071,10 +1069,8 @@ static void mos6522_q800_via1_init(Object *obj) static void mos6522_q800_via1_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); - MOS6522DeviceClass *mdc =3D MOS6522_DEVICE_CLASS(oc); =20 dc->reset =3D mos6522_q800_via1_reset; - mdc->portB_write =3D mos6522_q800_via1_portB_write; } =20 static const TypeInfo mos6522_q800_via1_type_info =3D { --=20 2.20.1