From patchwork Tue Apr 6 11:44:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 49500 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 EF2D3B7D0D for ; Tue, 6 Apr 2010 21:49:06 +1000 (EST) Received: from localhost ([127.0.0.1]:56574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz7HE-0001JR-1I for incoming@patchwork.ozlabs.org; Tue, 06 Apr 2010 07:49:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nz7DF-0000Py-ME for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:44:57 -0400 Received: from [140.186.70.92] (port=35085 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz7DD-0000PA-Kf for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:44:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nz7DC-0000Ij-1k for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:44:55 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:65429) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nz7DB-0000IT-Mw for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:44:54 -0400 Received: from flocke.weilnetz.de (p54ADF876.dip.t-dialin.net [84.173.248.118]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MflE8-1ODShK3XC0-00NuSl; Tue, 06 Apr 2010 13:44:51 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1Nz7Cy-0007qK-2R; Tue, 06 Apr 2010 13:44:40 +0200 From: Stefan Weil To: QEMU Developers Date: Tue, 6 Apr 2010 13:44:02 +0200 Message-Id: <1270554249-24861-3-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> References: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX1+751t+sZk4voH5TUDJG58n17OCpfsr1FjsMFj q1rj1Tia0bjGpt00ycFpjN6fO9/djQFuHpOrttVHCFSEZa6zum KFiHiRHsALn4ZAwsdum/rEB9hXMBLTlRLvjLLftH2gDLqGB9I5 hhg== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 2/9] eepro100: Simplify status handling 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 Signed-off-by: Stefan Weil --- hw/eepro100.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 0415132..741031c 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -175,6 +175,7 @@ typedef enum { } scb_command_bit; typedef enum { + STATUS_NOT_OK = 0, STATUS_C = BIT(15), STATUS_OK = BIT(13), } scb_status_bit; @@ -882,7 +883,7 @@ static void action_command(EEPRO100State *s) bool bit_s; bool bit_i; bool bit_nc; - bool success = true; + uint16_t ok_status = STATUS_OK; s->cb_address = s->cu_base + s->cu_offset; read_cb(s); bit_el = ((s->tx.command & COMMAND_EL) != 0); @@ -915,7 +916,7 @@ static void action_command(EEPRO100State *s) case CmdTx: if (bit_nc) { missing("CmdTx: NC = 0"); - success = false; + ok_status = STATUS_NOT_OK; break; } tx_command(s); @@ -932,11 +933,11 @@ static void action_command(EEPRO100State *s) break; default: missing("undefined command"); - success = false; + ok_status = STATUS_NOT_OK; break; } /* Write new status. */ - stw_phys(s->cb_address, s->tx.status | STATUS_C | (success ? STATUS_OK : 0)); + stw_phys(s->cb_address, s->tx.status | ok_status | STATUS_C); if (bit_i) { /* CU completed action. */ eepro100_cx_interrupt(s);