From patchwork Tue Mar 2 21:37:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 46720 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]) by ozlabs.org (Postfix) with ESMTP id 69467B7D19 for ; Wed, 3 Mar 2010 09:07:41 +1100 (EST) Received: from localhost ([127.0.0.1]:37366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nma9u-0000VR-1R for incoming@patchwork.ozlabs.org; Tue, 02 Mar 2010 17:01:42 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NmZpJ-0004dP-0S for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:25 -0500 Received: from [199.232.76.173] (port=37836 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmZpI-0004d6-Gb for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:24 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NmZpH-0004xt-0U for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:24 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:65470) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NmZpG-0004xn-E2 for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:22 -0500 Received: from flocke.weilnetz.de (p54ADFEFD.dip.t-dialin.net [84.173.254.253]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Lxbep-1NgFCh28Wh-016Xf1; Tue, 02 Mar 2010 22:40:04 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1NmZon-00052H-Oo; Tue, 02 Mar 2010 22:39:53 +0100 From: Stefan Weil To: QEMU Developers X-Mailer: git-send-email 1.7.0 In-Reply-To: <4B7821AC.6080400@mail.berlios.de> References: <4B7821AC.6080400@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX1/sqBdhmIejoKq4vhUpU8Yt8ZZSlXFhZ0kCZu0 nppMFMwp+5fS9HjVtKNZeEnYW6CbFgeV0Vm25ZEs+ToUQGv8oD e3af33rlohwFwk2p4aNyy3T2Ll4fmtd+fDU4J56bjmoA9ULUog B6w== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: mst@redhat.com Subject: [Qemu-devel] [PATCHv3 12/20] eepro100: Replace variable name to fix a compiler warning 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 When compiling with -Wshadow, gcc gives a warning which is fixed by renaming stat -> status. Signed-off-by: Stefan Weil --- hw/eepro100.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 2a871b8..7eaa876 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -392,14 +392,14 @@ static void eepro100_acknowledge(EEPRO100State * s) } } -static void eepro100_interrupt(EEPRO100State * s, uint8_t stat) +static void eepro100_interrupt(EEPRO100State * s, uint8_t status) { uint8_t mask = ~s->mem[SCBIntmask]; - s->mem[SCBAck] |= stat; - stat = s->scb_stat = s->mem[SCBAck]; - stat &= (mask | 0x0f); - //~ stat &= (~s->mem[SCBIntmask] | 0x0xf); - if (stat && (mask & 0x01)) { + s->mem[SCBAck] |= status; + status = s->scb_stat = s->mem[SCBAck]; + status &= (mask | 0x0f); + //~ status &= (~s->mem[SCBIntmask] | 0x0xf); + if (status && (mask & 0x01)) { /* SCB mask and SCB Bit M do not disable interrupt. */ enable_interrupt(s); } else if (s->int_stat) {