From nobody Thu Nov 6 20:28:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 148771544135299.49693771599891; Tue, 21 Feb 2017 14:17:21 -0800 (PST) Received: from localhost ([::1]:48831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgIkK-00040B-4x for importer@patchew.org; Tue, 21 Feb 2017 17:17:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgIiK-0002qe-Cg for qemu-devel@nongnu.org; Tue, 21 Feb 2017 17:15:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgIiH-0004SX-Vv for qemu-devel@nongnu.org; Tue, 21 Feb 2017 17:15:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44268) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgIiH-0004Rr-N5 for qemu-devel@nongnu.org; Tue, 21 Feb 2017 17:15:13 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C15B8C0092D5; Tue, 21 Feb 2017 22:15:13 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-47.ams2.redhat.com [10.36.116.47]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1LMFBP4003882; Tue, 21 Feb 2017 17:15:12 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id F345780F44; Tue, 21 Feb 2017 23:15:09 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 21 Feb 2017 23:14:52 +0100 Message-Id: <1487715299-21102-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1487715299-21102-1-git-send-email-kraxel@redhat.com> References: <1487715299-21102-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 21 Feb 2017 22:15:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/9] sparc: use sparc_graphic_* defines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , Gerd Hoffmann , Artyom Tarasenko Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This switches over sparc to use the new sparc_graphic_* defines. Signed-off-by: Gerd Hoffmann --- hw/sparc/sun4m.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index f5b6efd..1aaad68 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -908,43 +908,43 @@ static void sun4m_hw_init(const struct sun4m_hwdef *h= wdef, ledma =3D sparc32_dma_init(hwdef->dma_base + 16ULL, slavio_irq[16], iommu, &ledma_irq, 1); =20 - if (graphic_depth !=3D 8 && graphic_depth !=3D 24) { - error_report("Unsupported depth: %d", graphic_depth); + if (sparc_graphic_depth !=3D 8 && sparc_graphic_depth !=3D 24) { + error_report("Unsupported depth: %d", sparc_graphic_depth); exit (1); } num_vsimms =3D 0; if (num_vsimms =3D=3D 0) { if (vga_interface_type =3D=3D VGA_CG3) { - if (graphic_depth !=3D 8) { - error_report("Unsupported depth: %d", graphic_depth); + if (sparc_graphic_depth !=3D 8) { + error_report("Unsupported depth: %d", sparc_graphic_depth); exit(1); } =20 - if (!(graphic_width =3D=3D 1024 && graphic_height =3D=3D 768) = && - !(graphic_width =3D=3D 1152 && graphic_height =3D=3D 900))= { - error_report("Unsupported resolution: %d x %d", graphic_wi= dth, - graphic_height); + if (!(sparc_graphic_width =3D=3D 1024 && sparc_graphic_height = =3D=3D 768) && + !(sparc_graphic_width =3D=3D 1152 && sparc_graphic_height = =3D=3D 900)) { + error_report("Unsupported resolution: %d x %d", sparc_grap= hic_width, + sparc_graphic_height); exit(1); } =20 /* sbus irq 5 */ cg3_init(hwdef->tcx_base, slavio_irq[11], 0x00100000, - graphic_width, graphic_height, graphic_depth); + sparc_graphic_width, sparc_graphic_height, sparc_grap= hic_depth); } else { /* If no display specified, default to TCX */ - if (graphic_depth !=3D 8 && graphic_depth !=3D 24) { - error_report("Unsupported depth: %d", graphic_depth); + if (sparc_graphic_depth !=3D 8 && sparc_graphic_depth !=3D 24)= { + error_report("Unsupported depth: %d", sparc_graphic_depth); exit(1); } =20 - if (!(graphic_width =3D=3D 1024 && graphic_height =3D=3D 768))= { + if (!(sparc_graphic_width =3D=3D 1024 && sparc_graphic_height = =3D=3D 768)) { error_report("Unsupported resolution: %d x %d", - graphic_width, graphic_height); + sparc_graphic_width, sparc_graphic_height); exit(1); } =20 tcx_init(hwdef->tcx_base, slavio_irq[11], 0x00100000, - graphic_width, graphic_height, graphic_depth); + sparc_graphic_width, sparc_graphic_height, sparc_grap= hic_depth); } } =20 @@ -1025,7 +1025,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *h= wdef, =20 nvram_init(nvram, (uint8_t *)&nd_table[0].macaddr, machine->kernel_cmd= line, machine->boot_order, machine->ram_size, kernel_size, - graphic_width, graphic_height, graphic_depth, + sparc_graphic_width, sparc_graphic_height, sparc_graphic_de= pth, hwdef->nvram_machine_id, "Sun4m"); =20 if (hwdef->ecc_base) @@ -1037,9 +1037,9 @@ static void sun4m_hw_init(const struct sun4m_hwdef *h= wdef, fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id); - fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth); - fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_WIDTH, graphic_width); - fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_HEIGHT, graphic_height); + fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, sparc_graphic_depth); + fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_WIDTH, sparc_graphic_width); + fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_HEIGHT, sparc_graphic_height); fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR); fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); if (machine->kernel_cmdline) { --=20 1.8.3.1