From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0X5T-00052X-Ps for qemu-devel@nongnu.org; Fri, 27 Jun 2014 10:25:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0X5N-0003Dh-TZ for qemu-devel@nongnu.org; Fri, 27 Jun 2014 10:25:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0X5N-0003CK-LF for qemu-devel@nongnu.org; Fri, 27 Jun 2014 10:25:05 -0400 From: Stefan Hajnoczi Date: Fri, 27 Jun 2014 16:24:53 +0200 Message-Id: <1403879093-786-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1403879093-786-1-git-send-email-stefanha@redhat.com> References: <1403879093-786-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 4/4] hw/net/eepro100: Implement read-only bits in MDI registers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi From: Peter Maydell 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 Message-id: 1402159924-13853-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Stefan Hajnoczi --- hw/net/eepro100.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index aaa3ff2..3263e3f 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) { -- 1.9.3