From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGGy3-0006W3-Km for qemu-devel@nongnu.org; Sat, 30 Apr 2011 16:40:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QGGy0-0000Wp-25 for qemu-devel@nongnu.org; Sat, 30 Apr 2011 16:40:43 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:55930) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGGxz-0000WK-Lp for qemu-devel@nongnu.org; Sat, 30 Apr 2011 16:40:40 -0400 From: Stefan Weil Date: Sat, 30 Apr 2011 22:40:09 +0200 Message-Id: <1304196013-14432-7-git-send-email-weil@mail.berlios.de> In-Reply-To: <1304196013-14432-1-git-send-email-weil@mail.berlios.de> References: <1304196013-14432-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH v2 06/10] eepro100: Support byte/word writes to port address List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: QEMU Developers port is a 32 bit register, but may be written using 8 or 16 bit writes. Add support for byte/word writes. Signed-off-by: Stefan Weil --- hw/eepro100.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 134e146..37172a5 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1316,8 +1316,9 @@ static uint32_t eepro100_read_port(EEPRO100State * s) return 0; } -static void eepro100_write_port(EEPRO100State * s, uint32_t val) +static void eepro100_write_port(EEPRO100State *s) { + uint32_t val = e100_read_reg4(s, SCBPort); uint32_t address = (val & ~PORT_SELECTION_MASK); uint8_t selection = (val & PORT_SELECTION_MASK); switch (selection) { @@ -1471,7 +1472,15 @@ static void eepro100_write1(EEPRO100State * s, uint32_t addr, uint8_t val) } eepro100_interrupt(s, 0); break; + case SCBPort: + case SCBPort + 1: + case SCBPort + 2: + TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val)); + break; case SCBPort + 3: + TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val)); + eepro100_write_port(s); + break; case SCBFlow: /* does not exist on 82557 */ case SCBFlow + 1: case SCBFlow + 2: @@ -1506,6 +1515,13 @@ static void eepro100_write2(EEPRO100State * s, uint32_t addr, uint16_t val) eepro100_write_command(s, val); eepro100_write1(s, SCBIntmask, val >> 8); break; + case SCBPort: + TRACE(OTHER, logout("addr=%s val=0x%04x\n", regname(addr), val)); + break; + case SCBPort + 2: + TRACE(OTHER, logout("addr=%s val=0x%04x\n", regname(addr), val)); + eepro100_write_port(s); + break; case SCBeeprom: TRACE(OTHER, logout("addr=%s val=0x%04x\n", regname(addr), val)); eepro100_write_eeprom(s->eeprom, val); @@ -1528,7 +1544,7 @@ static void eepro100_write4(EEPRO100State * s, uint32_t addr, uint32_t val) break; case SCBPort: TRACE(OTHER, logout("addr=%s val=0x%08x\n", regname(addr), val)); - eepro100_write_port(s, val); + eepro100_write_port(s); break; case SCBCtrlMDI: eepro100_write_mdi(s, val); -- 1.7.2.5