From nobody Sun May 12 03:38:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602622175; cv=none; d=zohomail.com; s=zohoarc; b=UBYmQx3TLZix6yIh+Oe8Sor9xjc2DPSuIzUxJWDU2NSeOWb7w7sho41qv3pwe0ZHcOKD/ueHbP7pGkLqxfUVoRg1pru0JkmNnjyMidGH30sh71BVVz7e+K5q+Wk0tyrvTP6Svu7JyoGUtCR3YPrcHtT6Z/NHjBIX5ZbtAdMaUeQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602622175; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6qMlhkEv9iKK/AzILGVv++UgKiF/26CFqopHWYu/hic=; b=B8kI8wYgEUK/u4lrC6cGg0C62KNId2J192uAn+nMjMyDNV6etXJ4mBcrV89RiP53Fl6ECNKQLqUyWdRJp83jlGTAsDFGDuAteOaQL28pE4AKj1qLRYLdifI5R4vYnOSzFnx4fLynuIUuMCrDB2rFYVc9qelZpJdsNcM/5x8FV80= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1602622175694759.1232045682456; Tue, 13 Oct 2020 13:49:35 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id g12so966728wrp.10 for ; Tue, 13 Oct 2020 13:49:35 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id l8sm1089196wrn.28.2020.10.13.13.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 13:49:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6qMlhkEv9iKK/AzILGVv++UgKiF/26CFqopHWYu/hic=; b=rajKc07J3mY7U2PABxj/aJvWzXSqs2J9CMV/Ke9q+2rZDt5FvoHDWQ0O6nuAlrQNmd rhbiWjyn49ELobw4orVjaG/7zERAyUwfQTuCd5ClHi68xRwwR13WVbuY5R7qpDNSSsGG bxYnBAPT9sYZ5c4jOmhdfS3hSE0i1TBcGCnnK82h9eaKpX+TGh2taqkn8fduHTHJJL2y WExi1pE+msBBWVMC43tPH94t8BWUOh3iFP6SNusWHeKIggVQqDw+aLHg3GT9z1WJ4x2u OUIY2G8WJqbmwU6CfunKzrWTlUrhSs2VQEOyadECiBO/1Dcg7FuymexjCUz4xoFGqOQi nK6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6qMlhkEv9iKK/AzILGVv++UgKiF/26CFqopHWYu/hic=; b=itkmerLRzYL8ti7UipwNEFZI6I/SiJxza6TFuHo8TQ/KU2H1DCRWcE83vkIZWjs67Q 1nHb00ViVFEqNZZUma9p3+DXpeeYbFVHIwmFER+RKhURqRcSni/zwvgRM9Ck7hhwJaf2 I8Tpb1qIlPegaRHgSmPhLSipUCYBqaDfmyqfrqPww53PaZFFawgB6avjjA2m7rVPHQpF 1EzU8fO1rp2Q58dpmwM1UZkva0XFT263PA1Ot63rL9Z2CwZPlrBE0XSX2SlnmfMfcaOD u9tNZ72rhQ2nVBC6A5fOVaSDdvrco18FEj1j+xS8CitGRA2oMqtXzTOmt9+XIdJbfrtK HJ5g== X-Gm-Message-State: AOAM5337YGuXfI2/dy3bMsKjTZ9zCE3h19YlnIz2MIxRecJcv4KCc32S qUaZC2VlkcoQrJsEKfk5D+0= X-Google-Smtp-Source: ABdhPJxyvpP0pSvBkWbixki03S6cs+o2gpNBe3yLdFpF0vMs4bo59C4Nyv7WJK90o1dwmENE50+vwA== X-Received: by 2002:adf:f1c8:: with SMTP id z8mr1677165wro.371.1602622173746; Tue, 13 Oct 2020 13:49:33 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/3] hw/misc/mac_via: Make generic via_irq_request() from via1_irq_request() Date: Tue, 13 Oct 2020 22:49:25 +0200 Message-Id: <20201013204927.3660030-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201013204927.3660030-1-f4bug@amsat.org> References: <20201013204927.3660030-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Rewrite via1_irq_request() as generic via_irq_request(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/mac_via.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 6db62dab7db..9e64c2521fc 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -324,6 +324,20 @@ static void via1_one_second_update(MOS6522Q800VIA1Stat= e *v1s) } } =20 +static void via_irq_request(void *opaque, int irq, int level) +{ + MOS6522State *s =3D MOS6522(opaque); + MOS6522DeviceClass *mdc =3D MOS6522_GET_CLASS(s); + + if (level) { + s->ifr |=3D 1 << irq; + } else { + s->ifr &=3D ~(1 << irq); + } + + mdc->update_irq(s); +} + static void via1_VBL(void *opaque) { MOS6522Q800VIA1State *v1s =3D opaque; @@ -348,21 +362,6 @@ static void via1_one_second(void *opaque) via1_one_second_update(v1s); } =20 -static void via1_irq_request(void *opaque, int irq, int level) -{ - MOS6522Q800VIA1State *v1s =3D opaque; - MOS6522State *s =3D MOS6522(v1s); - MOS6522DeviceClass *mdc =3D MOS6522_GET_CLASS(s); - - if (level) { - s->ifr |=3D 1 << irq; - } else { - s->ifr &=3D ~(1 << irq); - } - - mdc->update_irq(s); -} - static void via2_irq_request(void *opaque, int irq, int level) { MOS6522Q800VIA2State *v2s =3D opaque; @@ -1195,7 +1194,7 @@ static void mos6522_q800_via1_reset(DeviceState *dev) =20 static void mos6522_q800_via1_init(Object *obj) { - qdev_init_gpio_in_named(DEVICE(obj), via1_irq_request, "via1-irq", + qdev_init_gpio_in_named(DEVICE(obj), via_irq_request, "via1-irq", VIA1_IRQ_NB); } =20 --=20 2.26.2 From nobody Sun May 12 03:38:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602622180; cv=none; d=zohomail.com; s=zohoarc; b=g7oJ6MTG/joU344DEfVz4+U4O+Cs9ViDIpv7mV1cy9uhTDW5aeTQG/iisKKTG4jcwD4nmg3Gs/qLr8C3RHqBG2tLpdqy2dC8UOrT+nmXCXMjDWpGj2sMjxqTzUHxyT2A9eW4FmKiPK1zwxaBO65w/7GvqVhWuSuc5AEeVs6PZqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602622180; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gOH6Q54y5+3ER9eqXc0qEYERFLAXoc2wlUjL0YVFDAk=; b=RiyYnoSdcgse7qbPiHzwgHiKPMadcVTCKFPCoDDCJ0yNpDH4Hb+HUx2J65XIalzjSBN2/f39Zi6NneS8tnC7PAwU3BrDBvYz7+eTGKiPHLxhKBOiGPsm9YfyBV/7qfDwd1LmrhNmqhPOHK3o6s5Dp3cfKDXVy2nvBjBeAoWSqqg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1602622180143671.685058577432; Tue, 13 Oct 2020 13:49:40 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id d81so158262wmc.1 for ; Tue, 13 Oct 2020 13:49:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id y4sm1001930wrp.74.2020.10.13.13.49.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 13:49:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gOH6Q54y5+3ER9eqXc0qEYERFLAXoc2wlUjL0YVFDAk=; b=DfgRosG+nVYuSBFgCGpyby5/NTTaj+746Y2zNUvEuMmcK2fPOCZxBcQwS01wuIDDUh NzBBgyOcN4qp//vogkO5tHGNUMflMQUjp+J45EMynVVWXiT/ZNK6fTnr/qQ9AvaRrKie 259D4Or4PvLFI7u8wbnz1wsicS6nlfZYBkrwMUT5tLCbSupWArujCmtHzum0U+H1N1is yDLUFJ0KPLLg+BWBqA5soF3zJaMjf2aEITQxxxVuI+/RrexAc2ig+DO6R9ibo3kgtORa k2DpXhtyfMD7RN4APxcX4DUDdOTo9BsOsy6XFVdJCBnrFs5WlAc0c7XOEIKY1oLbB8oY sCFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gOH6Q54y5+3ER9eqXc0qEYERFLAXoc2wlUjL0YVFDAk=; b=KMKxbiTEutfI5H1g5IBZ7swVQSli5X94G+a4aht+hC5YXhkgRxmpbsqrusnifGA48G TDel2SlkVlc7DEwOdyxl2Cq2FabcMoerMvwRa6Hm5/TQmq3N7aHwMotC3Z/D3ey4l8ss ur9330cl0HDclpiIh4iuNl1lus8xkgr5qP8ke0F2Aer6m9ZO1+nZjwZetJu3AZG5LljA rFS9guLZKpS9IoDV8tXzNJgfh1O5eQt30wePG1aYYNqt/PpLOehl3IC+zxoCx513ziej mj5iaA6BbZHNPZUCRiGe0+udGokjheBy+7rPoOWQxQKuYxetiRL1ZZK5Bi/66Gsri7GP fIGA== X-Gm-Message-State: AOAM530NPoTaZlqyjWAnZ/zo8qVB+jxq0NRLXzGisTh7UKrVpkmM/uky ZoYjOD9DuY+DAiMLPP8sDKw= X-Google-Smtp-Source: ABdhPJxpnTXUtFP8iTI7SqGS2RLgkGowP5G6P7QV3AciA5M0y4ij9MSgKkQKUhvzeKvL8EDv0P2KPA== X-Received: by 2002:a7b:c183:: with SMTP id y3mr166452wmi.84.1602622178176; Tue, 13 Oct 2020 13:49:38 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/3] hw/misc/mac_via: Replace via2_irq_request() with via_irq_request() Date: Tue, 13 Oct 2020 22:49:26 +0200 Message-Id: <20201013204927.3660030-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201013204927.3660030-1-f4bug@amsat.org> References: <20201013204927.3660030-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/mac_via.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 9e64c2521fc..54088b6625a 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -362,22 +362,6 @@ static void via1_one_second(void *opaque) via1_one_second_update(v1s); } =20 -static void via2_irq_request(void *opaque, int irq, int level) -{ - MOS6522Q800VIA2State *v2s =3D opaque; - MOS6522State *s =3D MOS6522(v2s); - MOS6522DeviceClass *mdc =3D MOS6522_GET_CLASS(s); - - if (level) { - s->ifr |=3D 1 << irq; - } else { - s->ifr &=3D ~(1 << irq); - } - - mdc->update_irq(s); -} - - static void pram_update(MacVIAState *m) { if (m->blk) { @@ -1238,7 +1222,7 @@ static void mos6522_q800_via2_reset(DeviceState *dev) =20 static void mos6522_q800_via2_init(Object *obj) { - qdev_init_gpio_in_named(DEVICE(obj), via2_irq_request, "via2-irq", + qdev_init_gpio_in_named(DEVICE(obj), via_irq_request, "via2-irq", VIA2_IRQ_NB); } =20 --=20 2.26.2 From nobody Sun May 12 03:38:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) client-ip=209.85.221.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602622184; cv=none; d=zohomail.com; s=zohoarc; b=hW/SQAShtzDpoOui10vK5lNuuxfD3KRM6afUIL2tB1GV28PVMMl35IgKK82hSWpOZj9IQTsMLiP65MhkZ6nE3aB03+bLXcQRjqYWN2jNd+ODpy7Z8LhESrILKicRZrVG/GC5Eia7slWYbKgTRSkllYmmpWUoHrBm8HE5WC8SYVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602622184; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HzYO5fAKE8c5Bjci2IhRroM8+dk3HQe48ilewjjRlvA=; b=jwFeMpUQfVN5L6DvUjSjeAX2ZQ5ldlXcOxKCSZh658O7WmRmndOcZMSENc3e+0M5vzkN7iq8WRChy09aU1kSGCfRk67Ly5ikgN+gemc85SHIxl/3UK2naO0KgaHS0U5yNJpSyVwsuhOHy+TL+l5falo62FPrfZI0IRtg2btP1oE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.zohomail.com with SMTPS id 160262218448332.45048739916899; Tue, 13 Oct 2020 13:49:44 -0700 (PDT) Received: by mail-wr1-f66.google.com with SMTP id i1so1032326wro.1 for ; Tue, 13 Oct 2020 13:49:43 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id t83sm192680wmf.39.2020.10.13.13.49.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 13:49:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HzYO5fAKE8c5Bjci2IhRroM8+dk3HQe48ilewjjRlvA=; b=ld9DCnPjE7vWNZkoZdiJVRIRto7erUFrMGGYhrszRAFirD4bm2KnxomrVLUeuZN+VI BbU6bsdNFwGc9Wjb38r3dwclEvRa1rxST2Lgy85RCs/kLfJZcn2+rrtQLeD9NkYIz81F j7N3x6Pe58izObkKcecG7Rv/5FaZ7o+OGz/clR2gV3zRDJbLFkF+y3aRNYEASQeCFRES ymknPJIwFr9F3/BXnEcDreqwKe12r54K+L++P5pUvyftOmNaPFQum4Kzsi9VJ3Qa2gfS iZHR3v93xTbp7BxiXSJr7v0fODKf7q4nKUcqeDXumck4emgp8OENE0kSBTxRsGNk2ca2 nVdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HzYO5fAKE8c5Bjci2IhRroM8+dk3HQe48ilewjjRlvA=; b=oUvB9sUamURqARGgg8CzGxlOVjOnIT72WEl9wNUInO2itXJIa33F3iK7rOfOteqhI3 gczFI8r/AgBdgdEOhozVzLXx+jtihUCtlG2kndXjlmdGwSmMrZGnxd/bH2kSn0fd6oIJ dGg+4B5JV2wrReSA8+8a+bCGweW5J9l+oAkinb/XqLM57b4PG4GZDj/PrNL/F9A6vmOy +mvW7n2H8QV1DXacap0En3+qVe5dEruEvCxQZO1Q20EsAaks4P/eCLZH/YqfhPYtrU7g irimh6cvbOpGMGcSiAO0KNbvWmB7L6nnlfyny/stPVZ6ELKeS/yLtLM/fZFE8AWlcCYc FC4Q== X-Gm-Message-State: AOAM5320jyeQA5RPtVFG2aAAuc/ZsuHJdd9lIBfw7suHVdOhOfMigYiH xdPQ2/OT72qG0/9XNeJYORw= X-Google-Smtp-Source: ABdhPJz5JRXAWCfY6NAPz+3FitbPy8fqAAPotFS1QWJLpU8s3JpglpNbjQX1Ls1aNot3Nen+ZjhCiw== X-Received: by 2002:a5d:6a0a:: with SMTP id m10mr1640326wru.189.1602622182713; Tue, 13 Oct 2020 13:49:42 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/3] hw/misc/mac_via: Use via_irq_request() in via1_VBL(), via1_one_second() Date: Tue, 13 Oct 2020 22:49:27 +0200 Message-Id: <20201013204927.3660030-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201013204927.3660030-1-f4bug@amsat.org> References: <20201013204927.3660030-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) via1_VBL() and via1_one_second() just call the generic via_irq_request() handler raising a specific IRQ. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/mac_via.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 54088b6625a..00877a42447 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -341,11 +341,8 @@ static void via_irq_request(void *opaque, int irq, int= level) static void via1_VBL(void *opaque) { MOS6522Q800VIA1State *v1s =3D opaque; - MOS6522State *s =3D MOS6522(v1s); - MOS6522DeviceClass *mdc =3D MOS6522_GET_CLASS(s); =20 - s->ifr |=3D VIA1_IRQ_VBLANK; - mdc->update_irq(s); + via_irq_request(v1s, VIA1_IRQ_VBLANK, 1); =20 via1_VBL_update(v1s); } @@ -353,11 +350,8 @@ static void via1_VBL(void *opaque) static void via1_one_second(void *opaque) { MOS6522Q800VIA1State *v1s =3D opaque; - MOS6522State *s =3D MOS6522(v1s); - MOS6522DeviceClass *mdc =3D MOS6522_GET_CLASS(s); =20 - s->ifr |=3D VIA1_IRQ_ONE_SECOND; - mdc->update_irq(s); + via_irq_request(v1s, VIA1_IRQ_ONE_SECOND, 1); =20 via1_one_second_update(v1s); } --=20 2.26.2