From nobody Fri Oct 24 20:16:08 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.zohomail.com; dkim=fail; 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 1518669521705590.2055273039928; Wed, 14 Feb 2018 20:38:41 -0800 (PST) Received: from localhost ([::1]:37554 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBJg-00062w-PN for importer@patchew.org; Wed, 14 Feb 2018 23:38:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBD-0007v2-DR for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBC-00044u-EG for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:55 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:37139) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBC-00044n-AP for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:29:54 -0500 Received: by mail-qt0-x241.google.com with SMTP id d26so8885887qtj.4 for ; Wed, 14 Feb 2018 20:29:54 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.29.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:29:53 -0800 (PST) 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=JYLRUXR8csDauu779wQkLVzT+5wDruTCXU+S0WV/xo8=; b=B3j34NibefxIgg7gMxwQsZ/tMn365cEz2I1Dd2SxcySq+HZ2y9c3KD0wQzQfEI6GE2 68PdrCNU8XuY6am/Br0YTel4gd8CgJtH1Zbr6v2QiT4Sn3pPN5Fni0dBc8h+jVOIguSZ wAqIEObo8uX4UNJC8tvVG5B5T6EuV736B1rpiWQgNjjZ1D44rJKEXh362MpK81JP1jCJ jy6nyHhFF+hsAWwpk3ZAsA38ja/Vj4AsQUQ/Y2jn44+EotgVbVjxemn+3WZzz5dkV1tI QU+VFw8SrPUZiVvAGhE7CGBikh+FJF1/D6RfRx2IMbL1ymNBxkWah5i9rJK4YJwPJEtz iEtA== 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=JYLRUXR8csDauu779wQkLVzT+5wDruTCXU+S0WV/xo8=; b=AKsgFINs9fOp+sHa/aUUNqySbYxay/lS1pwnPARekgxcT1yFWCChg+9zNxBokg91j7 uFSGhpQPdD+nxCtaMBl6Pw/DlEfIRnq8QoRUOZ9L7JVR/kGN7ouECJDDvDMWogBlcPPK ySwnQFc6C+m17KTt7P3Eprqqa3qu4WSkLhE4ypMG0MIZ27HC46V6l4k7z1qEPW1XyYIl yVczaLtSh/gLoSHM+1V0/wq7sy8POA9qLjC95APkrzBRtSwQFtRKFO29rG7zkn+6+KDw VT47vyfeexHhiUoI45YSMAc6olY8EGnftPQdS2tZW0zCs7rF9TNJb7WNtB2xlI4hXXCU npyA== X-Gm-Message-State: APf1xPDXcV+f07t7nMcqu49fpOpCnvTMMCYlK8m6K8lo2slXw2WlLxZN 7ZoSPSNiGperBpbbkIdZ+z7Vle2k X-Google-Smtp-Source: AH8x224UWuRzVFbUWcKX30LrVM2WjFEjvUr6K/WDgr3qkHiEeLDHxRdfTsgM0ZIRakWabzpXojyG6g== X-Received: by 10.200.6.75 with SMTP id e11mr2221927qth.146.1518668993767; Wed, 14 Feb 2018 20:29:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:44 -0300 Message-Id: <20180215042900.16078-15-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH 14/30] hw/alpha: use the BYTE-based definitions 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/alpha/typhoon.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 6a40869488..0acfb4b1d0 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -812,8 +812,6 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_= bus, qemu_irq *p_rtc_irq, AlphaCPU *cpus[4], pci_map_irq_fn sys_map_irq) { - const uint64_t MB =3D 1024 * 1024; - const uint64_t GB =3D 1024 * MB; MemoryRegion *addr_space =3D get_system_memory(); DeviceState *dev; TyphoonState *s; @@ -854,30 +852,30 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **is= a_bus, =20 /* Pchip0 CSRs, 0x801.8000.0000, 256MB. */ memory_region_init_io(&s->pchip.region, OBJECT(s), &pchip_ops, s, "pch= ip0", - 256*MB); + 256 * M_BYTE); memory_region_add_subregion(addr_space, 0x80180000000ULL, &s->pchip.region); =20 /* Cchip CSRs, 0x801.A000.0000, 256MB. */ memory_region_init_io(&s->cchip.region, OBJECT(s), &cchip_ops, s, "cch= ip0", - 256*MB); + 256 * M_BYTE); memory_region_add_subregion(addr_space, 0x801a0000000ULL, &s->cchip.region); =20 /* Dchip CSRs, 0x801.B000.0000, 256MB. */ memory_region_init_io(&s->dchip_region, OBJECT(s), &dchip_ops, s, "dch= ip0", - 256*MB); + 256 * M_BYTE); memory_region_add_subregion(addr_space, 0x801b0000000ULL, &s->dchip_region); =20 /* Pchip0 PCI memory, 0x800.0000.0000, 4GB. */ - memory_region_init(&s->pchip.reg_mem, OBJECT(s), "pci0-mem", 4*GB); + memory_region_init(&s->pchip.reg_mem, OBJECT(s), "pci0-mem", 4 * G_BYT= E); memory_region_add_subregion(addr_space, 0x80000000000ULL, &s->pchip.reg_mem); =20 /* Pchip0 PCI I/O, 0x801.FC00.0000, 32MB. */ memory_region_init_io(&s->pchip.reg_io, OBJECT(s), &alpha_pci_ignore_o= ps, - NULL, "pci0-io", 32*MB); + NULL, "pci0-io", 32 * M_BYTE); memory_region_add_subregion(addr_space, 0x801fc000000ULL, &s->pchip.reg_io); =20 @@ -898,13 +896,13 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **is= a_bus, =20 /* Pchip0 PCI special/interrupt acknowledge, 0x801.F800.0000, 64MB. */ memory_region_init_io(&s->pchip.reg_iack, OBJECT(s), &alpha_pci_iack_o= ps, - b, "pci0-iack", 64*MB); + b, "pci0-iack", 64 * M_BYTE); memory_region_add_subregion(addr_space, 0x801f8000000ULL, &s->pchip.reg_iack); =20 /* Pchip0 PCI configuration, 0x801.FE00.0000, 16MB. */ memory_region_init_io(&s->pchip.reg_conf, OBJECT(s), &alpha_pci_conf1_= ops, - b, "pci0-conf", 16*MB); + b, "pci0-conf", 16 * M_BYTE); memory_region_add_subregion(addr_space, 0x801fe000000ULL, &s->pchip.reg_conf); =20 --=20 2.16.1