From patchwork Mon Jul 15 21:06:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Dennis-Jordan X-Patchwork-Id: 13735363 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AE146C3DA42 for ; Wed, 17 Jul 2024 11:08:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sU2SG-0008RE-En; Wed, 17 Jul 2024 07:04:16 -0400 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 1sU2SE-0008JS-EE for qemu-devel@nongnu.org; Wed, 17 Jul 2024 07:04:14 -0400 Received: from 89-104-8-17.customer.bnet.at ([89.104.8.17] helo=intel-mbp.local) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sU2SC-0006zP-Qr for qemu-devel@nongnu.org; Wed, 17 Jul 2024 07:04:14 -0400 Received: by intel-mbp.local (Postfix, from userid 501) id DB34937960D; Mon, 15 Jul 2024 23:07:37 +0200 (CEST) From: Phil Dennis-Jordan To: qemu-devel@nongnu.org, pbonzini@redhat.com, agraf@csgraf.de, graf@amazon.com, marcandre.lureau@redhat.com, berrange@redhat.com, thuth@redhat.com, philmd@linaro.org, peter.maydell@linaro.org, akihiko.odaki@daynix.com, phil@philjordan.eu, lists@philjordan.eu Subject: [PATCH 04/26] hw/display/apple-gfx: uses DEFINE_TYPES macro Date: Mon, 15 Jul 2024 23:06:43 +0200 Message-Id: <20240715210705.32365-5-phil@philjordan.eu> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240715210705.32365-1-phil@philjordan.eu> References: <20240715210705.32365-1-phil@philjordan.eu> MIME-Version: 1.0 Received-SPF: none client-ip=89.104.8.17; envelope-from=phil@intel-mbp.local; helo=intel-mbp.local X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.001, KHOP_HELO_FCRDNS=0.261, NO_DNS_FOR_FROM=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_NONE=0.001, TVD_RCVD_IP=0.001 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Switches the device definition to the more modern macro variants. Signed-off-by: Phil Dennis-Jordan --- hw/display/apple-gfx.m | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m index 3b437e2519..87bcdcd98e 100644 --- a/hw/display/apple-gfx.m +++ b/hw/display/apple-gfx.m @@ -86,10 +86,8 @@ -(void)mmioWriteAtOffset:(size_t) offset value:(uint32_t)value; typedef QTAILQ_HEAD(, AppleGFXTask) AppleGFXTaskList; typedef struct AppleGFXState { - /* Private */ SysBusDevice parent_obj; - /* Public */ qemu_irq irq_gfx; qemu_irq irq_iosfc; MemoryRegion iomem_gfx; @@ -562,17 +560,14 @@ static void apple_gfx_class_init(ObjectClass *klass, void *data) dc->realize = apple_gfx_realize; } -static TypeInfo apple_gfx_info = { - .name = TYPE_APPLE_GFX, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(AppleGFXState), - .class_init = apple_gfx_class_init, - .instance_init = apple_gfx_init, +static TypeInfo apple_gfx_types[] = { + { + .name = TYPE_APPLE_GFX, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(AppleGFXState), + .class_init = apple_gfx_class_init, + .instance_init = apple_gfx_init, + } }; -static void apple_gfx_register_types(void) -{ - type_register_static(&apple_gfx_info); -} - -type_init(apple_gfx_register_types) +DEFINE_TYPES(apple_gfx_types)