From patchwork Fri Dec 16 21:42:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 634486 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1086963pvb; Fri, 16 Dec 2022 14:29:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Du13AOynsfN/5faBTnis4tT2lYTL08hpzgPlpdut8M70OyMnpAMWs8RDPCQ8zX5AhMheA X-Received: by 2002:a05:622a:5a87:b0:3a5:723e:8c22 with SMTP id fz7-20020a05622a5a8700b003a5723e8c22mr41727284qtb.47.1671229740200; Fri, 16 Dec 2022 14:29:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671229740; cv=none; d=google.com; s=arc-20160816; b=SrS43HvoDXfGKOhN+wjWq7U5cWkgM0jl3wc4BRSmc3a3xQIbfQNjq2do9rhd/+yPkN RzrGGCezlHofMSLaFnTqZ+CksUtZ6Fouw6teKos8zbRRAwpT4J0n0XBXzUK5K6forgYb Shnw/DOCNd+uGhCfeKBG0u7s1RbrYsTmEaPsY5jI04i4Yoy2+kCh7tpzr6S71Qf+NNiS 05+GP1A3tS2lkdneAjkVgRs3B70qiXAcY6XkfazuKXWvcp7623JmTIdD/1GELsGSYE8q ADwVPL6MxUoQGJipJnDCYzioyLYpEoNCIr+WVCBQC0AS8NPGJA+knwWy3pp4iF7DvT/J O7fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=A2o/3JD/47KFZGGuCaIY7m7S85np6OtsBKjDrudLLbI=; b=ZA64rW1S3rPY/FzsA+Je3KE4unuYJLgN9sJ5goCil2FdMMhZCm5ihBJy1MSjX5RNLI KOFWLjQCWlPlEaYvoXLQwrEl1TmF9BNXLxfMemVleoQNKO8wXmAl8c0ApJUH1btGY7ps FXOrasSsDFn6mdKnD57bf9sOtpzFy1TV4sZjkdwOgovB5vvGSY+0wjJkZIVWCG/MV4K5 Eo5C/DQG0QzkZMfM5IYDglaVp0q9ot7/yf3tCFQENGducbMRiCae6ykdjBPtz8mBwD6b b35m+pfabCnsqCF51Pm6WYZj7Pegqihttbe/LdYt35Prq+sA/R4jI4TU49K47pD238g2 V/Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hcsLKqGh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r9-20020ac84249000000b003a7e6b0073csi1589618qtm.60.2022.12.16.14.29.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Dec 2022 14:29:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hcsLKqGh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6IU2-00060g-6w; Fri, 16 Dec 2022 16:43:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6ITr-0005wQ-Sx for qemu-devel@nongnu.org; Fri, 16 Dec 2022 16:43:05 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6ITn-0000bu-Gu for qemu-devel@nongnu.org; Fri, 16 Dec 2022 16:42:58 -0500 Received: by mail-wm1-x330.google.com with SMTP id ja17so2736186wmb.3 for ; Fri, 16 Dec 2022 13:42:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=A2o/3JD/47KFZGGuCaIY7m7S85np6OtsBKjDrudLLbI=; b=hcsLKqGhSuByZBWzM6fIlTEEvqViVoWa5KW1CJ1tcEdkIWrkmG7xpg1mwLz+PiOvEY bN5RGmJMiQWY9sczcyD/iDjdibM78JVn2XodSvPBW9aG95Xfjw2L3oPL6EtpluUyEgAy /xm4J7S0WNAI7CqB5VI91oFCC5G+RNKykPRSCX5pFDRVrLiwvImDj/zAAkbEFmo/15Hn 7N8vZCd3ER09NZRZvu879A/5DseqXmYGGQjwGKoZ+dxMYNXySkXntVfeMd7WhQESy929 Wn5V6yXWl9NfeXv//Zh5V2eR6HKjOCcp3Q0cVMtlkgwENo97CBASs/I1ORI7mYbcUFQ+ JKAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A2o/3JD/47KFZGGuCaIY7m7S85np6OtsBKjDrudLLbI=; b=2887D0EQqVzvBBRu1WQG0oBmgx74nWe4nVJEZQ+tQG5DNkyGn6tb7iqB3HuDuJukpd CZxACVpPr5dAF4oYwGGVQKISHGJbncT0dLFYPnouGIGfL1GKiNjX4O0KHC7KORX1c5tx hfNpRAyCH/ezxjFtK5YwXFztO32/VoAtoL9YgMXEHYcJTMHxABsFSaKcafDGx+uxAnrc /DXPXQO954A10/+KNraDLRjYgIFLjzfgRyYrkpWK1sqTm98JtLnnTWe0sCA8ziinXjd6 X+14wKeyTz4pX2KtZKTwvTL4KasO1bIk5buI9ANsSFlEd32Tt6OEM/PORR8nIS7AeB7e z3tA== X-Gm-Message-State: ANoB5pk+lYgFzqjeDqVJuCHzckCNLB8gOlUlzASNY4b/4bhyMaQHWXg4 yG9l2w7umq+yQ448GZV7gEBqZRH7pFCpI8P5 X-Received: by 2002:a7b:c4d2:0:b0:3d1:f270:a81e with SMTP id g18-20020a7bc4d2000000b003d1f270a81emr27490719wmk.17.1671226974271; Fri, 16 Dec 2022 13:42:54 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id y7-20020a05600c364700b003d33ab317dasm4135263wmq.14.2022.12.16.13.42.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 13:42:53 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/36] hw/misc/mos6522: Convert TYPE_MOS6522 to 3-phase reset Date: Fri, 16 Dec 2022 21:42:17 +0000 Message-Id: <20221216214244.1391647-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216214244.1391647-1-peter.maydell@linaro.org> References: <20221216214244.1391647-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Convert the TYPE_MOS6522 parent class to use 3-phase reset. This is a prerequisite for converting its subclasses. Signed-off-by: Peter Maydell Acked-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20221110143459.3833425-2-peter.maydell@linaro.org --- hw/misc/mos6522.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index fe38c44426b..0ed631186c3 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -643,9 +643,9 @@ const VMStateDescription vmstate_mos6522 = { } }; -static void mos6522_reset(DeviceState *dev) +static void mos6522_reset_hold(Object *obj) { - MOS6522State *s = MOS6522(dev); + MOS6522State *s = MOS6522(obj); s->b = 0; s->a = 0; @@ -705,9 +705,10 @@ static Property mos6522_properties[] = { static void mos6522_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); + ResettableClass *rc = RESETTABLE_CLASS(oc); MOS6522DeviceClass *mdc = MOS6522_CLASS(oc); - dc->reset = mos6522_reset; + rc->phases.hold = mos6522_reset_hold; dc->vmsd = &vmstate_mos6522; device_class_set_props(dc, mos6522_properties); mdc->portB_write = mos6522_portB_write;