Re: [PATCH 04/31] e1000: Use hw/net/mii.h

[Philippe Mathieu-Daudé]

On 12/1/23 10:57, Akihiko Odaki wrote:
> hw/net/mii.h provides common definitions for MII.
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> ---
>   hw/net/e1000.c         | 86 ++++++++++++++++++------------------
>   hw/net/e1000_regs.h    | 46 --------------------
>   hw/net/e1000e.c        |  1 +
>   hw/net/e1000e_core.c   | 99 +++++++++++++++++++++---------------------
>   hw/net/e1000x_common.c |  5 ++-
>   hw/net/e1000x_common.h |  8 ++--
>   6 files changed, 101 insertions(+), 144 deletions(-)

>   static const char phy_regcap[0x20] = {
> -    [PHY_STATUS]      = PHY_R,     [M88E1000_EXT_PHY_SPEC_CTRL] = PHY_RW,
> -    [PHY_ID1]         = PHY_R,     [M88E1000_PHY_SPEC_CTRL]     = PHY_RW,
> -    [PHY_CTRL]        = PHY_RW,    [PHY_1000T_CTRL]             = PHY_RW,
> -    [PHY_LP_ABILITY]  = PHY_R,     [PHY_1000T_STATUS]           = PHY_R,
> -    [PHY_AUTONEG_ADV] = PHY_RW,    [M88E1000_RX_ERR_CNTR]       = PHY_R,
> -    [PHY_ID2]         = PHY_R,     [M88E1000_PHY_SPEC_STATUS]   = PHY_R,
> -    [PHY_AUTONEG_EXP] = PHY_R,
> +    [MII_BMSR] = PHY_R,       [M88E1000_EXT_PHY_SPEC_CTRL] = PHY_RW,

Align off, otherwise:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

> +    [MII_PHYID1] = PHY_R,     [M88E1000_PHY_SPEC_CTRL]     = PHY_RW,
> +    [MII_BMCR]   = PHY_RW,    [MII_CTRL1000]               = PHY_RW,
> +    [MII_ANLPAR] = PHY_R,     [MII_STAT1000]               = PHY_R,
> +    [MII_ANAR]   = PHY_RW,    [M88E1000_RX_ERR_CNTR]       = PHY_R,
> +    [MII_PHYID2] = PHY_R,     [M88E1000_PHY_SPEC_STATUS]   = PHY_R,
> +    [MII_ANER]   = PHY_R,
>   };