diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-09 16:03:08 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-06-27 12:23:45 +0200 |
| commit | 5e80dd223ded254b1802bdd6417ef118456eadce (patch) | |
| tree | 312e6370d8d9cabf775b4f90473cbf3a7e1a072e /hw/net | |
| parent | 575a1c0e42287f8342a7e93e03c53edeb152399d (diff) | |
| download | focaccia-qemu-5e80dd223ded254b1802bdd6417ef118456eadce.tar.gz focaccia-qemu-5e80dd223ded254b1802bdd6417ef118456eadce.zip | |
hw/net/eepro100: Implement read-only bits in MDI registers
Although we defined an eepro100_mdi_mask[] array indicating which bits in the registers are read-only, we weren't actually doing anything with it. Make the MDI register-write code use it rather than manually making register 1 read-only and leaving the rest as reads-as-written. (The special-case handling of register 0 remains as before since its mask is all-zeros and the special casing happens before we apply the masking.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1402159924-13853-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/eepro100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index aaa3ff2360..3263e3fe90 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -1217,7 +1217,6 @@ static void eepro100_write_mdi(EEPRO100State *s) break; case 1: /* Status Register */ missing("not writable"); - data = s->mdimem[reg]; break; case 2: /* PHY Identification Register (Word 1) */ case 3: /* PHY Identification Register (Word 2) */ @@ -1230,7 +1229,8 @@ static void eepro100_write_mdi(EEPRO100State *s) default: missing("not implemented"); } - s->mdimem[reg] = data; + s->mdimem[reg] &= eepro100_mdi_mask[reg]; + s->mdimem[reg] |= data & ~eepro100_mdi_mask[reg]; } else if (opcode == 2) { /* MDI read */ switch (reg) { |