From patchwork Sun Feb 14 16:16:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 45327 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 9A7C3B7B98 for ; Mon, 15 Feb 2010 04:12:11 +1100 (EST) Received: from localhost ([127.0.0.1]:40401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NgheO-00045D-L9 for incoming@patchwork.ozlabs.org; Sun, 14 Feb 2010 11:48:52 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NghBN-0006UJ-VI for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:18:54 -0500 Received: from [199.232.76.173] (port=54203 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NghBN-0006U0-DW for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:18:53 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NghBM-0002CE-86 for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:18:53 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:50257) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NghBL-0002CA-OQ for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:18:52 -0500 Received: from flocke.weilnetz.de (p54ADCA6B.dip.t-dialin.net [84.173.202.107]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0M7EPO-1NvlpU3YxS-00wWAc; Sun, 14 Feb 2010 17:18:51 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1NghBA-0005Vc-2j; Sun, 14 Feb 2010 17:18:40 +0100 From: Stefan Weil To: QEMU Developers Date: Sun, 14 Feb 2010 17:16:25 +0100 Message-Id: <1266164189-21062-16-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1266164189-21062-15-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> X-Provags-ID: V01U2FsdGVkX18YNbI2874mbmhpX3/C3wIl0KLBBeawZpqLEsZ 6G3NWD8eACAzvxH3jVuM5T67OfW9hagRCA8fPNsbhxxyeanQhj 7BPA9KdBllaDxyIXV3UDHISWKkp1W6cQYZem91oXg+sHPDOknt Pkg== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 16/20] eepro100: Use tx.status 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 There is no need for a local variable "status". Using tx.status makes it clearer which status is addressed. Signed-off-by: Stefan Weil --- hw/eepro100.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 368a9d6..ebf0f7d 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -903,10 +903,10 @@ 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 status = le16_to_cpu(s->tx.status); 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", - status, command, s->tx.link); + 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); @@ -950,7 +950,7 @@ static void action_command(EEPRO100State *s) break; } /* Write new status. */ - stw_phys(s->cb_address, status | STATUS_C | (success ? STATUS_OK : 0)); + stw_phys(s->cb_address, s->tx.status | STATUS_C | (success ? STATUS_OK : 0)); if (bit_i) { /* CU completed action. */ eepro100_cx_interrupt(s);