From nobody Tue Feb 10 11:14:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625999786; cv=none; d=zohomail.com; s=zohoarc; b=YAlf0JsrW5aMsji5qqQLyA9KOGdBGHq0SmSfEiW9B23uWGE8cqxh/vHTDksYR/SUqh6ZaK5vfbsrB2toSe8vtPWggkAj8jgF1PF/KmEdB9qimmzWusFxRFbCTQ8/vxkdxx5BbYg40Q8eFvDdnSiF+t+omC05Enm1AQFet6M6ApQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625999786; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ciVo7kEqxY4swYhIluiodO0kr4geA/OgIFKlydbaSPI=; b=BmIKVY9K3b1sh02LN+L31zlSCX2c+W9tX0efKjX9h8v+kaCld0cYoGDdfiPsYgyJ9EFUCYxLl9JJBYP2NfvH8xLqq82+g6X4+1i6c+JVukwuLCQinrLPvRACtfxuF4D+50+/HNXbR9nCZSJsxfd7685C9zBwS+KP/n+m/DLq1QM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1625999786755437.46858845210977; Sun, 11 Jul 2021 03:36:26 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id t5so6238444wrw.12 for ; Sun, 11 Jul 2021 03:36:26 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (static-189-95-145-212.ipcom.comunitel.net. [212.145.95.189]) by smtp.gmail.com with ESMTPSA id x8sm3425829wrt.93.2021.07.11.03.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 03:36:24 -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=ciVo7kEqxY4swYhIluiodO0kr4geA/OgIFKlydbaSPI=; b=k5wd24nPiUZP0klrfhD/ftxHQvKRSpn3QX1YWr+dR614rzAAAF5IFwYC1zSIcQ+Bon 8fuvF77G2E9ue+g8UKSCFFsyaPxe0JAug1jEM0R4drB5Ninz5LvxXvS0K8lHCr5e5pqP UDqj1k+RynemhCER00WSgsQYpCq3AYyLCR9fBmvjryU02frf21O+8lWJPobZZo7lD0ry rbKTg7FhOF0jPSy3z1bE5BXv0/YuT8JtHrr29cCnHywORB1TROFq9pc8KvfogWX/Ilia yewn9fBzTmH0MSvVKURJVcNEEjZssVJglzqso/fDDpufKEoc1oknLtBjS7cUySzh6Cge aihw== 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=ciVo7kEqxY4swYhIluiodO0kr4geA/OgIFKlydbaSPI=; b=UeQjOtfxzhuZtYzTEN6EWBvw3MY95JWrVIMWlN4obQtdFOIjFecqJwlbvfo8fL9o7z TbiM5IBEZM/zbnAZv+SUVCT8n7Dxu9regzAniVA4gpsz2lAPe0yF5ImxKHk5npYbcTYv PGuUZdykVzJB1QWImGG6fkBz/+CKJoD5AoxgPytpmBh9L9VVdFPbFXmHQ9Bqf9Esh0aj qQBFFYUp+RJgxclujOLIHnz9p+v2/Ga+W6N3+0iuO8ypIPMJKZ61ayHaiAO+sxtvJXGg 2qG0d00T2tHt4yHwgEBUpCdwsHnOp8H7mPkgbhEmaY2Y5u9bELCJN429bNDaHsrx9hmr 49JQ== X-Gm-Message-State: AOAM530wzoU3ZLtCK/B9y/b2yPDV2DEOLd1uYbeIGLUQl47qqipxfdo5 5kbgoYnt6dh3iZetmC8ae1A= X-Google-Smtp-Source: ABdhPJxqxhcGWqi1BjMywXXQ7OZbdJQ7hgvhruyFkbdtdPWJH+7lxRQhkwdXNZWSbFQcv4iGWaDh+Q== X-Received: by 2002:adf:a54b:: with SMTP id j11mr35078063wrb.305.1625999785075; Sun, 11 Jul 2021 03:36:25 -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: Mark Cave-Ayland , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Jason Wang , Laurent Vivier , Finn Thain , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 2/5] dp8393x: Replace 0x40 magic value by SONIC_REG16_COUNT definition Date: Sun, 11 Jul 2021 12:36:09 +0200 Message-Id: <20210711103612.2661521-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210711103612.2661521-1-f4bug@amsat.org> References: <20210711103612.2661521-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: 1625999787848100001 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> --- 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