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: 9598 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 A37A123EE2 for ; Mon, 25 Jun 2012 12:45:24 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6EA8AA1808D for ; Mon, 25 Jun 2012 12:45:24 +0000 (UTC) Received: by yenq6 with SMTP id q6so2970005yen.11 for ; Mon, 25 Jun 2012 05:45:24 -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=QYV2GTNggWaN9eReIbKl2vharGzQ5qQJP6ylDGS2y1w=; b=EYv7DjBgo8+wXnZWBq8il143XTiYoG2RTPDRpUcuAlSh4/WpAlPQDVO+8SMQd5H9TA c7yYS9wQPcin7uPcokyz8U3xS1PUr9U6VUCZaiehOaldoXoirSvivt+aomem16iXpW3T WuyLo3gZgtimqkkSKFLeOtSufspGEcBZxIOeSfp8umWCYfHhq/hlT33eB1AqCzStMszQ 5c/onF52HYVK5naXqbAfsJkFb+gm/rlojMTq44MyDyTrYGAeOt/F657UYZlwtdYonqrR CGI/OXjS+C6XW5ABlesOyR4NBI4kSaNYrELpUw9qBwfvPlgu57JiA8KuskASnyw3mSbo lMbw== Received: by 10.50.163.99 with SMTP id yh3mr7777880igb.53.1340628323650; Mon, 25 Jun 2012 05:45:23 -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 v20csp46000ibb; Mon, 25 Jun 2012 05:45:22 -0700 (PDT) Received: by 10.216.193.162 with SMTP id k34mr6115485wen.54.1340628321932; Mon, 25 Jun 2012 05:45:21 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id bn3si15641689wib.3.2012.06.25.05.45.20 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jun 2012 05:45:21 -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 1Sj8fM-0006qA-Lm; Mon, 25 Jun 2012 13:45:16 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH 2/4] hw/omap.h: Use PRIxPLX to define OMAP_FMT_plx 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-Gm-Message-State: ALoCoQl5vl68vs6SnsYLhfXkr++pGwl2f2DHXy3e62a/N2VhGf1Z52qb5iYRofGWO/ImzDjLUrmU 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,