From nobody Fri Oct 24 20:18:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of _spf.google.com designates 209.85.220.193 as permitted sender) client-ip=209.85.220.193; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-qk0-f193.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of _spf.google.com designates 209.85.220.193 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by mx.zohomail.com with SMTPS id 1518669018013798.3946892213244; Wed, 14 Feb 2018 20:30:18 -0800 (PST) Received: by mail-qk0-f193.google.com with SMTP id z197so12596369qkb.6 for ; Wed, 14 Feb 2018 20:30:17 -0800 (PST) Return-Path: Return-Path: Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:16 -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=tS6N32aqPY7x+TTEuvHXDv9hqaO9i7o+Ojp9fYmI5qs=; b=kuzW07s9pjzL3LsNb+RTb3Exp0pKDqm1VVRrkK1XrxawR+8ZqHSf5ivIcpwbGcE2wm OE7DPlclmALr8cqfMw+54JRnFQuJC3son5PKRwwJsQamhRE+BWWttfjcqlhVEaFxFjGz iBJmXN6OSeDknLM9gk3gpcPyejf0y7qjSJhePWxBwaO/rs73Rb7VWNVN1kOOBUyisYLr DOucHY2RYeqK3G0PsnEUDbYR6byFfSt0s4qzU/gdvPuenH8wJwmz8oesNo7OrsISSMQR DHr+/Zb01oicOnGXAW8tFQZ8KuzzrHZdhY1CzPYa5Q9BfYw1RP4WAVIaQXHv7ZnOHxlx lbmg== 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=tS6N32aqPY7x+TTEuvHXDv9hqaO9i7o+Ojp9fYmI5qs=; b=mQ/ApHBxaRkb5sNeaeHw/RLNSk4n2C0MAN7rd9ZTB0gjqrNr5uxKndDegvk4sSdcw2 CU+ZdnVXQRWh5+6nyf4yxLbpEL0oKRWFw1kf5MO8+FKPO4gQZq2TDJn5mFZrGnEYMMiH s+xwXyC6an1FKPknIwsPIp6TWjcvE3jN1MRbezab9RelvmUEETOopeBy5byPt3QsfqEF K9lcKAHXFgRuM1y6hR8PyN4AzsuCbHBOJKj148TPgnL05atKqIwEEnKR2be2eJFmOHT0 +y9yIzK8H1aO112egzFClprB+oVdRuablj26jEIm3yJxZYlYC/2O2sL4FohQJc+PliaJ CTjA== X-Gm-Message-State: APf1xPApA+oRtTq3q0tG4HEibR1RNar8y4yhFX12q6X55p/De2wlsXz0 l0wxJFcpJtxGdg0mZ+B/pmA= X-Google-Smtp-Source: AH8x227WvDB1Jr3Pd5tDKkREFbrIM4Xold7c7tp8wi5OpXiaMDc22QF2xnMgCRbpLXU26KQR1Q4Flg== X-Received: by 10.55.219.1 with SMTP id e1mr2157125qki.151.1518669016984; Wed, 14 Feb 2018 20:30:16 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Dmitry Fleytman , Jason Wang , Stefan Weil , Beniamino Galvani , qemu-arm@nongnu.org (open list:Allwinner-a10) Subject: [PATCH 23/30] hw/net: use the BYTE-based definitions Date: Thu, 15 Feb 2018 01:28:53 -0300 Message-Id: <20180215042900.16078-24-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-ZohoMail-DKIM: pass (identity @gmail.com) X-ZohoMail: RDKM_0 RSF_0 Z_629925259 SPT_0 It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/net/allwinner_emac.h | 4 ++-- hw/net/e1000e.c | 6 +++--- hw/net/eepro100.c | 6 ++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/hw/net/allwinner_emac.h b/include/hw/net/allwinner_ema= c.h index 4cc8aab7ec..93ec0e7067 100644 --- a/include/hw/net/allwinner_emac.h +++ b/include/hw/net/allwinner_emac.h @@ -125,8 +125,8 @@ #define EMAC_INT_RX (1 << 8) =20 /* Due to lack of specifications, size of fifos is chosen arbitrarily */ -#define TX_FIFO_SIZE (4 * 1024) -#define RX_FIFO_SIZE (32 * 1024) +#define TX_FIFO_SIZE (4 * K_BYTE) +#define RX_FIFO_SIZE (32 * K_BYTE) =20 #define NUM_TX_FIFOS 2 #define RX_HDR_SIZE 8 diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 16a9417a85..767b35fca8 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -81,10 +81,10 @@ typedef struct E1000EState { #define E1000E_IO_IDX 2 #define E1000E_MSIX_IDX 3 =20 -#define E1000E_MMIO_SIZE (128 * 1024) -#define E1000E_FLASH_SIZE (128 * 1024) +#define E1000E_MMIO_SIZE (128 * K_BYTE) +#define E1000E_FLASH_SIZE (128 * K_BYTE) #define E1000E_IO_SIZE (32) -#define E1000E_MSIX_SIZE (16 * 1024) +#define E1000E_MSIX_SIZE (16 * K_BYTE) =20 #define E1000E_MSIX_TABLE (0x0000) #define E1000E_MSIX_PBA (0x2000) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index a07a63247e..6fdeb05259 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -60,8 +60,6 @@ * changed to pad short packets itself. */ #define CONFIG_PAD_RECEIVED_FRAMES =20 -#define KiB 1024 - /* Debug EEPRO100 card. */ #if 0 # define DEBUG_EEPRO100 @@ -104,9 +102,9 @@ /* Use 64 word EEPROM. TODO: could be a runtime option. */ #define EEPROM_SIZE 64 =20 -#define PCI_MEM_SIZE (4 * KiB) +#define PCI_MEM_SIZE (4 * K_BYTE) #define PCI_IO_SIZE 64 -#define PCI_FLASH_SIZE (128 * KiB) +#define PCI_FLASH_SIZE (128 * K_BYTE) =20 #define BITS(n, m) (((0xffffffffU << (31 - n)) >> (31 - n + m)) << m) =20 --=20 2.16.1