From patchwork Tue Jan 5 06:27:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 42172 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 C3541B6EEE for ; Wed, 6 Jan 2010 07:16:34 +1100 (EST) Received: from localhost ([127.0.0.1]:44503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSFpO-0002Br-51 for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2010 15:16:30 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSF6d-0000Jz-H9 for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:30:15 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSF6Y-0000Bz-DN for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:30:14 -0500 Received: from [199.232.76.173] (port=60411 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSF6X-0000BR-PU for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:30:10 -0500 Received: from mx20.gnu.org ([199.232.41.8]:35598) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NSF6W-00043h-TG for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:30:09 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NS7Wz-0005DT-8g for qemu-devel@nongnu.org; Tue, 05 Jan 2010 06:24:57 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id E3D4D18285; Tue, 5 Jan 2010 15:27:42 +0900 (JST) Received: (nullmailer pid 22692 invoked by uid 1000); Tue, 05 Jan 2010 06:27:50 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kraxel@redhat.com Date: Tue, 5 Jan 2010 15:27:47 +0900 Message-Id: <1262672870-22607-25-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1262672870-22607-1-git-send-email-yamahata@valinux.co.jp> References: <1262672870-22607-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V11 24/27] pc_smbus: remove #ifdef DEBUG. 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 remove #ifdef DEBUG by using macro. Signed-off-by: Isaku Yamahata --- hw/pc_smbus.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/hw/pc_smbus.c b/hw/pc_smbus.c index 30cdaa7..1d44d1e 100644 --- a/hw/pc_smbus.c +++ b/hw/pc_smbus.c @@ -37,6 +37,15 @@ #define SMBHSTDAT1 0x06 #define SMBBLKDAT 0x07 +//#define DEBUG + +#ifdef DEBUG +# define SMBUS_DPRINTF(format, ...) printf(format, ## __VA_ARGS__) +#else +# define SMBUS_DPRINTF(format, ...) do { } while (0) +#endif + + static void smb_transaction(PCSMBus *s) { uint8_t prot = (s->smb_ctl >> 2) & 0x07; @@ -45,9 +54,7 @@ static void smb_transaction(PCSMBus *s) uint8_t addr = s->smb_addr >> 1; i2c_bus *bus = s->smbus; -#ifdef DEBUG - printf("SMBus trans addr=0x%02x prot=0x%02x\n", addr, prot); -#endif + SMBUS_DPRINTF("SMBus trans addr=0x%02x prot=0x%02x\n", addr, prot); switch(prot) { case 0x0: smbus_quick_command(bus, addr, read); @@ -96,9 +103,7 @@ void smb_ioport_writeb(void *opaque, uint32_t addr, uint32_t val) { PCSMBus *s = opaque; addr &= 0x3f; -#ifdef DEBUG - printf("SMB writeb port=0x%04x val=0x%02x\n", addr, val); -#endif + SMBUS_DPRINTF("SMB writeb port=0x%04x val=0x%02x\n", addr, val); switch(addr) { case SMBHSTSTS: s->smb_stat = 0; @@ -166,9 +171,7 @@ uint32_t smb_ioport_readb(void *opaque, uint32_t addr) val = 0; break; } -#ifdef DEBUG - printf("SMB readb port=0x%04x val=0x%02x\n", addr, val); -#endif + SMBUS_DPRINTF("SMB readb port=0x%04x val=0x%02x\n", addr, val); return val; }