From patchwork Mon Jun 25 12:45:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 167106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 80648B6FD9 for ; Mon, 25 Jun 2012 22:56:58 +1000 (EST) Received: from localhost ([::1]:39468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sj8qe-00053D-DN for incoming@patchwork.ozlabs.org; Mon, 25 Jun 2012 08:56:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sj8qS-00052K-Ep for qemu-devel@nongnu.org; Mon, 25 Jun 2012 08:56:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sj8qO-0000B7-35 for qemu-devel@nongnu.org; Mon, 25 Jun 2012 08:56:44 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:45098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sj8qN-0000Ar-S7 for qemu-devel@nongnu.org; Mon, 25 Jun 2012 08:56:40 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Sj8fM-0006qA-Lm; Mon, 25 Jun 2012 13:45:16 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 25 Jun 2012 13:45:14 +0100 Message-Id: <1340628316-26267-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1340628316-26267-1-git-send-email-peter.maydell@linaro.org> References: <1340628316-26267-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , patches@linaro.org Subject: [Qemu-devel] [PATCH 2/4] hw/omap.h: Use PRIxPLX to define OMAP_FMT_plx X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use the new PRIxPLX macro to avoid the need to define an OMAP_FMT_plx macro whose expansion depends directly on TARGET_PHYS_ADDR_BITS. Signed-off-by: Peter Maydell --- hw/omap.h | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/hw/omap.h b/hw/omap.h index 3d98941..2560aba 100644 --- a/hw/omap.h +++ b/hw/omap.h @@ -942,13 +942,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, unsigned long sdram_size, const char *core); -# if TARGET_PHYS_ADDR_BITS == 32 -# define OMAP_FMT_plx "%#08x" -# elif TARGET_PHYS_ADDR_BITS == 64 -# define OMAP_FMT_plx "%#08" PRIx64 -# else -# error TARGET_PHYS_ADDR_BITS undefined -# endif +#define OMAP_FMT_plx "%#08" PRIxPLX uint32_t omap_badwidth_read8(void *opaque, target_phys_addr_t addr); void omap_badwidth_write8(void *opaque, target_phys_addr_t addr,