From patchwork Mon Jun 25 15:52:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9604 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7BEB823F2E for ; Mon, 25 Jun 2012 15:52:32 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 49074A18341 for ; Mon, 25 Jun 2012 15:52:32 +0000 (UTC) Received: by ggnf1 with SMTP id f1so3202384ggn.11 for ; Mon, 25 Jun 2012 08:52:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gOKIfL19ajW0rvxpR4dOpVlNPBBZn+apftgXfcPefBk=; b=fX49mzjOwswvh/K+pSKmsN5LmlMe/QMeS7r9H0Ac8/KC1aq5TNqjSWp6EvPwcCHw5b b4G/F71Ydg/mzlkzc6e6cLP/f1kGxTKZXErDtJIdiaBM3ftIsxm4qmDLytfwuvqcHuRK Ma8JZyCI9EkYAhEGCKnq/x+UzoxcQCOV88qcaQZCZyJ/7V3hVg1ZycmNF3Kf4fCybc6u RdSAxTCnx3ToT4HPfN8SPDozDcZ6ugKp7h3J2+VgRhJeZCQcAMMLuTce+1x/bWru5rVl xvBXLx4RRAyhPWYYmbDM6gMCXecbkB97lm1ORNGTYiW5yTdtyNOD1OGVZOWgL/sw/npb F5Lw== Received: by 10.50.193.196 with SMTP id hq4mr8520854igc.57.1340639551488; Mon, 25 Jun 2012 08:52:31 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp51985ibb; Mon, 25 Jun 2012 08:52:30 -0700 (PDT) Received: by 10.216.208.151 with SMTP id q23mr4262486weo.20.1340639550303; Mon, 25 Jun 2012 08:52:30 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id 83si16655672wet.131.2012.06.25.08.52.29 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jun 2012 08:52:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SjBaS-0006uF-BV; Mon, 25 Jun 2012 16:52:24 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Eric Blake Subject: [PATCH v2 2/4] hw/omap.h: Use TARGET_PRIxPHYS to define OMAP_FMT_plx Date: Mon, 25 Jun 2012 16:52:22 +0100 Message-Id: <1340639544-26520-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1340639544-26520-1-git-send-email-peter.maydell@linaro.org> References: <1340639544-26520-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQkjUAHA9cJFGUQcvYvpV3Y0OpqjSpLl1r3NMD5N+J5jefdYH8AQ9bHCTokgAUmatbZ95tTe Use the new TARGET_PRIxPHYS 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 Acked-by: Andreas Färber --- hw/omap.h | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/hw/omap.h b/hw/omap.h index 3d98941..413851b 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" TARGET_PRIxPHYS uint32_t omap_badwidth_read8(void *opaque, target_phys_addr_t addr); void omap_badwidth_write8(void *opaque, target_phys_addr_t addr,