From owner-svn-src-projects@FreeBSD.ORG Sat Jan 12 04:36:40 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BC302401; Sat, 12 Jan 2013 04:36:40 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A47672F3; Sat, 12 Jan 2013 04:36:40 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0C4aevO086384; Sat, 12 Jan 2013 04:36:40 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0C4aecl086382; Sat, 12 Jan 2013 04:36:40 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201301120436.r0C4aecl086382@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 12 Jan 2013 04:36:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245322 - projects/altix2/sys/ia64/sgisn X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2013 04:36:40 -0000 Author: marcel Date: Sat Jan 12 04:36:40 2013 New Revision: 245322 URL: http://svnweb.freebsd.org/changeset/base/245322 Log: Put x in parenthesis fo safe macro expansion. Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.h Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.h ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_pcib.h Sat Jan 12 00:59:41 2013 (r245321) +++ projects/altix2/sys/ia64/sgisn/sgisn_pcib.h Sat Jan 12 04:36:40 2013 (r245322) @@ -63,17 +63,17 @@ #define PIC_REG_INT_MODE 0x00118 #define PIC_REG_INT_DEVICE 0x00120 #define PIC_REG_INT_HOSTERR 0x00128 -#define PIC_REG_INT_ADDR(x) (0x00130 + (x << 3)) +#define PIC_REG_INT_ADDR(x) (0x00130 + ((x) << 3)) #define PIC_REG_INT_ERRVIEW 0x00170 #define PIC_REG_INT_MULTI 0x00178 -#define PIC_REG_INT_FORCE(x) (0x00180 + (x << 3)) -#define PIC_REG_INT_PIN(x) (0x001c0 + (x << 3)) +#define PIC_REG_INT_FORCE(x) (0x00180 + ((x) << 3)) +#define PIC_REG_INT_PIN(x) (0x001c0 + ((x) << 3)) -#define PIC_REG_DEVICE(x) (0x00200 + (x << 3)) -#define PIC_REG_WR_REQ(x) (0x00240 + (x << 3)) -#define PIC_REG_RRB_MAP(x) (0x00280 + (x << 3)) +#define PIC_REG_DEVICE(x) (0x00200 + ((x) << 3)) +#define PIC_REG_WR_REQ(x) (0x00240 + ((x) << 3)) +#define PIC_REG_RRB_MAP(x) (0x00280 + ((x) << 3)) -#define PIC_REG_ATE(x) (0x10000 + (x << 3)) +#define PIC_REG_ATE(x) (0x10000 + ((x) << 3)) #define PIC_REG_ATE_SIZE 1024 struct sgisn_fwpcib {