From patchwork Wed May 19 18:40:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riccardo Magliocchetti X-Patchwork-Id: 53009 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 49100B7BEE for ; Thu, 20 May 2010 04:48:10 +1000 (EST) Received: from localhost ([127.0.0.1]:38804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEoJL-000253-Jg for incoming@patchwork.ozlabs.org; Wed, 19 May 2010 14:48:07 -0400 Received: from [140.186.70.92] (port=35113 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEoCD-0005X1-Fs for qemu-devel@nongnu.org; Wed, 19 May 2010 14:40:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEoC9-0004Hz-Hl for qemu-devel@nongnu.org; Wed, 19 May 2010 14:40:45 -0400 Received: from mail-ww0-f45.google.com ([74.125.82.45]:32885) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEoC9-0004HO-6D for qemu-devel@nongnu.org; Wed, 19 May 2010 14:40:41 -0400 Received: by mail-ww0-f45.google.com with SMTP id 24so1006032wwb.4 for ; Wed, 19 May 2010 11:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:in-reply-to:references; bh=hgUoaGkQ4n8Ia3e8npPLtzT6ltF5D7AFN7aW1RjodGw=; b=nPYw1Y+xecPPXyTu9gojh2PaoXKFNumUwy7nOJiJ+WM+jKh6N0emy+bJCDBv5dRMTz uRtfDZ/z0+THhmKLcF90VR5HodkfL+o9pR/MFI/dsC7hvcizHGEYtbrprMf3hap+iLYh Y9bvSODunAH85ocPXdKFFIaspu8U8P4McZjfM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=tekmOY4By3xq+jtzoXxEDLMg+HDNx2pz6TbTS4RR/mcTZvPpyTX5ciUtCJl+a1xOyc pEKSFRCZiCtBSyPwTIYy154ebhAHcoYj+KSW3ZPM9T1vqzzdguI/5Bpotca39ccRTAm7 CERd9zN4jCxjvnvhffrrxKFyGmiC291Cb9rxQ= Received: by 10.227.138.11 with SMTP id y11mr8100154wbt.87.1274294440585; Wed, 19 May 2010 11:40:40 -0700 (PDT) Received: from localhost.localdomain (dynamic-adsl-78-14-62-231.clienti.tiscali.it [78.14.62.231]) by mx.google.com with ESMTPS id l23sm58186014wbb.8.2010.05.19.11.40.38 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 19 May 2010 11:40:39 -0700 (PDT) From: Riccardo Magliocchetti To: qemu-devel@nongnu.org Date: Wed, 19 May 2010 20:40:18 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Riccardo Magliocchetti Subject: [Qemu-devel] [PATCH 1/3] Rename DEBUG field to TC_DEBUG to avoid name clashes 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 Some files use DEBUG as a preprocessor conditionals to enable debug code and i find handy to pass -DDEBUG as extra cflags at configure time. Unfortunately this cannot be done if DEBUG name is used for other purposes. Signed-off-by: Riccardo Magliocchetti --- hw/tc6393xb.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c index e0c5e5f..31a5fa1 100644 --- a/hw/tc6393xb.c +++ b/hw/tc6393xb.c @@ -49,7 +49,7 @@ #define SCR_FER 0xe0 /* b Function Enable */ #define SCR_MCR 0xe4 /* w Mode Control */ #define SCR_CONFIG 0xfc /* b Configuration Control */ -#define SCR_DEBUG 0xff /* b Debug */ +#define SCR_TC_DEBUG 0xff /* b Debug */ #define NAND_CFG_COMMAND 0x04 /* w Command */ #define NAND_CFG_BASE 0x10 /* l Control Base Address */ @@ -103,7 +103,7 @@ struct TC6393xbState { uint8_t FER; uint16_t MCR; uint8_t CONFIG; - uint8_t DEBUG; + uint8_t TC_DEBUG; } scr; uint32_t gpio_dir; uint32_t gpio_level; @@ -247,7 +247,7 @@ static uint32_t tc6393xb_scr_readb(TC6393xbState *s, target_phys_addr_t addr) SCR_REG_B(FER); SCR_REG_W(MCR); SCR_REG_B(CONFIG); - SCR_REG_B(DEBUG); + SCR_REG_B(TC_DEBUG); } fprintf(stderr, "tc6393xb_scr: unhandled read at %08x\n", (uint32_t) addr); return 0; @@ -308,7 +308,7 @@ static void tc6393xb_scr_writeb(TC6393xbState *s, target_phys_addr_t addr, uint3 SCR_REG_B(FER); SCR_REG_W(MCR); SCR_REG_B(CONFIG); - SCR_REG_B(DEBUG); + SCR_REG_B(TC_DEBUG); } fprintf(stderr, "tc6393xb_scr: unhandled write at %08x: %02x\n", (uint32_t) addr, value & 0xff);