diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-09 15:00:21 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-09 15:00:21 +0100 |
| commit | 4a331bb33bdf112ba95470e5d6ea3561b049c280 (patch) | |
| tree | 02ceecff81d33e73b19fd2dc38eb7a8e78a19ea2 /hw/net/e1000_regs.h | |
| parent | 5dfc05cb1d342f081df7009703559b29dadc33e9 (diff) | |
| parent | 7efea763772c815ad6220d5ea7a46447329f6015 (diff) | |
| download | focaccia-qemu-4a331bb33bdf112ba95470e5d6ea3561b049c280.tar.gz focaccia-qemu-4a331bb33bdf112ba95470e5d6ea3561b049c280.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
Net patches # gpg: Signature made Mon 09 Jun 2014 14:41:34 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" * remotes/stefanha/tags/net-pull-request: e1000: remove broken support for 82573L tests: e1000: test additional device IDs e1000: allow command-line selection of card model vmxnet3: fix msix vectors unuse net: xilinx_ethlite: Fix Rx-pong interrupt Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/e1000_regs.h')
| -rw-r--r-- | hw/net/e1000_regs.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/net/e1000_regs.h b/hw/net/e1000_regs.h index c9cb79e64d..13ac6713d4 100644 --- a/hw/net/e1000_regs.h +++ b/hw/net/e1000_regs.h @@ -99,6 +99,12 @@ #define E1000_DEV_ID_ICH8_IFE_G 0x10C5 #define E1000_DEV_ID_ICH8_IGP_M 0x104D +/* Device Specific Register Defaults */ +#define E1000_PHY_ID2_82541x 0x380 +#define E1000_PHY_ID2_82544x 0xC30 +#define E1000_PHY_ID2_8254xx_DEFAULT 0xC20 /* 82540x, 82545x, and 82546x */ +#define E1000_PHY_ID2_82573x 0xCC0 + /* Register Set. (82543, 82544) * * Registers are defined to be 32 bits and should be accessed as 32 bit values. |