From nobody Tue Feb 10 06:07:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1626037306; cv=none; d=zohomail.com; s=zohoarc; b=Q5v1QoFOWEjxdOwM9RsarpAzQ8HlHAtSUxCxW4rafV5on56jFzB8LjzYfK+7GgoASGnqFJWBpx25g+ZvlvWErgpEntT3l0RgdcY/CyNX7ZGQuTSqqhSrX2b+JEamyg9HbkiC/hbs99VgGkl3lj35gMiTmu71Lzwk1xZZn61bJG0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626037306; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OmxKGUjs4sfYwEkxfNiJeYY6j02zoeqKGP4fymZlAv8=; b=hJuOn56JqS703EXcDN/0pul1W/9mCGqV8BUGnBxLWtSrAueS9SXMEw7Q7ZNHPlc0CpWtkfrA2Bg4/D3dBmRaujmOQvhzZLfbI9eGCZEQsTVOpoDXMbllr9e88prvVeBLmoxyE9/3PRBWB+Uh/aChA4h1Y1yXqY4gKYTwZIwGVBU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1626037306514396.75667476068224; Sun, 11 Jul 2021 14:01:46 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id d12so21443212wre.13 for ; Sun, 11 Jul 2021 14:01:45 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (abayonne-654-1-142-116.w86-222.abo.wanadoo.fr. [86.222.93.116]) by smtp.gmail.com with ESMTPSA id n12sm12575506wmq.5.2021.07.11.14.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 14:01:44 -0700 (PDT) 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=OmxKGUjs4sfYwEkxfNiJeYY6j02zoeqKGP4fymZlAv8=; b=LV/LV5ws8pQWsRyae0dsgMEsXbuZaD1aLqvJKepZF5yq7SV5DFlfn7h6sAyxpCVsxQ m6D4yVdTnmjjV9eSkVlLWMFne0Kp+NmrSm8GYeKwhFt2WJp9pU0SzLLWt/v7PvsJW2oa sfgquBu/IOXEsr5gji+TBj5JjfffDnyLWXQGG3kOPei/aNFIKl0qdXfO+2SCoy8flzur sQktqur1eMjelt5ZiJoWy7NmfhrHCClvoxiYvHLea++WjSw4DT/9lUV9zHml1vgQm4Rx pEkE0cDYPHmbRO+b8qj6K0ZaOnxS4DW8ELAndj+EHH4m1QRieDXJV2L2VPWhyWRmE2VZ OvBg== 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=OmxKGUjs4sfYwEkxfNiJeYY6j02zoeqKGP4fymZlAv8=; b=Cq8Dv/ON55LAVMTZ8p2f9rj/tLPUwjp3F7to8OHQoOCmHOrq9dPMixm7AnRdMskyQS vEH1XQUz99OU5c5o1vgdqm47TqJSuY+AiHDjCYoUgwiBShYoi3WOSIfk8+q8b+e+tZ9L YHqpRpvpkAyzIgQxjV5SrtjKP+3UVTmF9719qYDJPpPDyA/d/GmXy6lWu8xrCcDq7DJg sDhmTokEdh3wWeGxLB0Sst6mIsudNgBYQKMJhQSfwT0CFdqZyRgM2U+XA2jlpEyAbKWI tGpJUjkrRh9Ab7eSC4phQ+cAMu/Q3GcvbNYUvkn0UJ9BVTdzMtmZkDOcrwx2pGRKM1k5 NL3w== X-Gm-Message-State: AOAM532IaSu6PJIYEX6CwqH6s4wTH2lDwjtFEx1L8+EJa0NTC2ny8WVP mwnosNoDXdRCNspJR5JzL6E= X-Google-Smtp-Source: ABdhPJz4LL4iYQ0A8UE6cz/ptj47F6yI4ZBLPuliA5VJaJQTd8WThVXRKyPMifAugkxkQjd14vZ20Q== X-Received: by 2002:a05:6000:1b0c:: with SMTP id f12mr10640801wrz.225.1626037304827; Sun, 11 Jul 2021 14:01:44 -0700 (PDT) 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?Herv=C3=A9=20Poussineau?= , Fredrik Noring , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Finn Thain Subject: [PULL 16/19] dp8393x: Replace 0x40 magic value by SONIC_REG_COUNT definition Date: Sun, 11 Jul 2021 23:00:13 +0200 Message-Id: <20210711210016.2710100-17-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210711210016.2710100-1-f4bug@amsat.org> References: <20210711210016.2710100-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-ZM-MESSAGEID: 1626037308185100001 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Tested-by: Finn Thain Message-Id: <20210710174954.2577195-3-f4bug@amsat.org> Tested-by: Mark Cave-Ayland --- hw/net/dp8393x.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 9118364aa33..d1e147a82a6 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -85,6 +85,7 @@ static const char *reg_names[] =3D { #define SONIC_MPT 0x2e #define SONIC_MDT 0x2f #define SONIC_DCR2 0x3f +#define SONIC_REG_COUNT 0x40 =20 #define SONIC_CR_HTX 0x0001 #define SONIC_CR_TXP 0x0002 @@ -158,7 +159,7 @@ struct dp8393xState { =20 /* Registers */ uint8_t cam[16][6]; - uint16_t regs[0x40]; + uint16_t regs[SONIC_REG_COUNT]; =20 /* Temporaries */ uint8_t tx_buffer[0x10000]; @@ -972,7 +973,7 @@ static void dp8393x_realize(DeviceState *dev, Error **e= rrp) =20 address_space_init(&s->as, s->dma_mr, "dp8393x"); memory_region_init_io(&s->mmio, OBJECT(dev), &dp8393x_ops, s, - "dp8393x-regs", 0x40 << s->it_shift); + "dp8393x-regs", SONIC_REG_COUNT << s->it_shift); =20 s->nic =3D qemu_new_nic(&net_dp83932_info, &s->conf, object_get_typename(OBJECT(dev)), dev->id, s); @@ -987,7 +988,7 @@ static const VMStateDescription vmstate_dp8393x =3D { .minimum_version_id =3D 0, .fields =3D (VMStateField []) { VMSTATE_BUFFER_UNSAFE(cam, dp8393xState, 0, 16 * 6), - VMSTATE_UINT16_ARRAY(regs, dp8393xState, 0x40), + VMSTATE_UINT16_ARRAY(regs, dp8393xState, SONIC_REG_COUNT), VMSTATE_END_OF_LIST() } }; --=20 2.31.1