From patchwork Sun Feb 14 16:16:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 45321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A5AA0B7B98 for ; Mon, 15 Feb 2010 04:00:42 +1100 (EST) Received: from localhost ([127.0.0.1]:54427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NghgR-0004Si-Jg for incoming@patchwork.ozlabs.org; Sun, 14 Feb 2010 11:50:59 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NghBY-0006Ym-9U for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:19:04 -0500 Received: from [199.232.76.173] (port=54205 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NghBX-0006YY-Rm for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:19:03 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NghBW-0002Ce-Ct for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:19:03 -0500 Received: from moutng.kundenserver.de ([212.227.17.9]:51910) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NghBV-0002CW-Sh for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:19:02 -0500 Received: from flocke.weilnetz.de (p54ADCA6B.dip.t-dialin.net [84.173.202.107]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0Lio0b-1OFDir3gCL-00cqs6; Sun, 14 Feb 2010 17:19:01 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1NghBK-0005Vf-3k; Sun, 14 Feb 2010 17:18:50 +0100 From: Stefan Weil To: QEMU Developers Date: Sun, 14 Feb 2010 17:16:26 +0100 Message-Id: <1266164189-21062-17-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1266164189-21062-16-git-send-email-weil@mail.berlios.de> References: <4B7821AC.6080400@mail.berlios.de> <1266164189-21062-1-git-send-email-weil@mail.berlios.de> <1266164189-21062-2-git-send-email-weil@mail.berlios.de> <1266164189-21062-3-git-send-email-weil@mail.berlios.de> <1266164189-21062-4-git-send-email-weil@mail.berlios.de> <1266164189-21062-5-git-send-email-weil@mail.berlios.de> <1266164189-21062-6-git-send-email-weil@mail.berlios.de> <1266164189-21062-7-git-send-email-weil@mail.berlios.de> <1266164189-21062-8-git-send-email-weil@mail.berlios.de> <1266164189-21062-9-git-send-email-weil@mail.berlios.de> <1266164189-21062-10-git-send-email-weil@mail.berlios.de> <1266164189-21062-11-git-send-email-weil@mail.berlios.de> <1266164189-21062-12-git-send-email-weil@mail.berlios.de> <1266164189-21062-13-git-send-email-weil@mail.berlios.de> <1266164189-21062-14-git-send-email-weil@mail.berlios.de> <1266164189-21062-15-git-send-email-weil@mail.berlios.de> <1266164189-21062-16-git-send-email-weil@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX19hjLJQI18sJD7fpX3k3+3TX/siTo0Pmis+iv/ 1kZQUHR4hUACH0PYim5rDSGqbdamWVAKaq+kDeq8uCEfOWRn5w GvBPXIpNTjKHJMYFayMm1jufPt8M54+tJDEICQXbDIWjmgrsRL 3VA== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 17/20] eepro100: New function for reading command block X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move code which reads the command block to the new function read_cb. The patch also fixes some endianess issues related to the command block and moves declarations of local variables to the beginning of the block. Signed-off-by: Stefan Weil --- hw/eepro100.c | 42 ++++++++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index ebf0f7d..43595eb 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -798,6 +798,16 @@ static void dump_statistics(EEPRO100State * s) //~ missing("CU dump statistical counters"); } +static void read_cb(EEPRO100State *s) +{ + cpu_physical_memory_read(s->cb_address, (uint8_t *) &s->tx, sizeof(s->tx)); + s->tx.status = le16_to_cpu(s->tx.status); + s->tx.command = le16_to_cpu(s->tx.command); + s->tx.link = le32_to_cpu(s->tx.link); + s->tx.tbd_array_addr = le32_to_cpu(s->tx.tbd_array_addr); + s->tx.tcb_bytes = le16_to_cpu(s->tx.tcb_bytes); +} + static void tx_command(EEPRO100State *s) { uint32_t tbd_array = le32_to_cpu(s->tx.tbd_array_addr); @@ -901,21 +911,25 @@ static void set_multicast_list(EEPRO100State *s) static void action_command(EEPRO100State *s) { for (;;) { - s->cb_address = s->cu_base + s->cu_offset; - cpu_physical_memory_read(s->cb_address, (uint8_t *)&s->tx, sizeof(s->tx)); - uint16_t command = le16_to_cpu(s->tx.command); - s->tx.status = le16_to_cpu(s->tx.status); - logout("val=(cu start), status=0x%04x, command=0x%04x, link=0x%08x\n", - s->tx.status, command, s->tx.link); - bool bit_el = ((command & COMMAND_EL) != 0); - bool bit_s = ((command & COMMAND_S) != 0); - bool bit_i = ((command & COMMAND_I) != 0); - bool bit_nc = ((command & COMMAND_NC) != 0); + bool bit_el; + bool bit_s; + bool bit_i; + bool bit_nc; bool success = true; - //~ bool bit_sf = ((command & COMMAND_SF) != 0); - uint16_t cmd = command & COMMAND_CMD; - s->cu_offset = le32_to_cpu(s->tx.link); - switch (cmd) { + s->cb_address = s->cu_base + s->cu_offset; + read_cb(s); + bit_el = ((s->tx.command & COMMAND_EL) != 0); + bit_s = ((s->tx.command & COMMAND_S) != 0); + bit_i = ((s->tx.command & COMMAND_I) != 0); + bit_nc = ((s->tx.command & COMMAND_NC) != 0); +#if 0 + bool bit_sf = ((s->tx.command & COMMAND_SF) != 0); +#endif + s->cu_offset = s->tx.link; + TRACE(OTHER, + logout("val=(cu start), status=0x%04x, command=0x%04x, link=0x%08x\n", + s->tx.status, s->tx.command, s->tx.link)); + switch (s->tx.command & COMMAND_CMD) { case CmdNOp: /* Do nothing. */ break;