From owner-svn-src-projects@FreeBSD.ORG Sat Jan 4 23:48:20 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF45F8DE; Sat, 4 Jan 2014 23:48:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CAA731CDA; Sat, 4 Jan 2014 23:48:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NmKdK065144; Sat, 4 Jan 2014 23:48:20 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NmKrH065143; Sat, 4 Jan 2014 23:48:20 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201401042348.s04NmKrH065143@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 4 Jan 2014 23:48:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260308 - 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.17 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, 04 Jan 2014 23:48:20 -0000 Author: marcel Date: Sat Jan 4 23:48:20 2014 New Revision: 260308 URL: http://svnweb.freebsd.org/changeset/base/260308 Log: Replace SHUB_MMR_PIO_WSTAT0 and SHUB_MMR_PIO_WSTAT1 with a parameterized variant, called SHUB_MMR_PIO_WSTAT(x). On Shub2-based systems there are 4 slices instead of 2 and as such there are 4 PIO/MEM status registers. Modified: projects/altix2/sys/ia64/sgisn/sgisn_shub.h Modified: projects/altix2/sys/ia64/sgisn/sgisn_shub.h ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_shub.h Sat Jan 4 23:45:55 2014 (r260307) +++ projects/altix2/sys/ia64/sgisn/sgisn_shub.h Sat Jan 4 23:48:20 2014 (r260308) @@ -45,8 +45,7 @@ #define SHUB_MMR_PTC_CFG0 0x101a0000 #define SHUB_MMR_PTC_CFG1 0x101a0080 #define SHUB_MMR_RTC 0x101c0000 -#define SHUB_MMR_PIO_WSTAT0 0x20070200 -#define SHUB_MMR_PIO_WSTAT1 0x20070280 +#define SHUB_MMR_PIO_WSTAT(x) (0x20070200 + (x) * 0x80) /* 0<=x<4 */ #define SHUB_MMR_PTC 0x70000000 #endif /* _IA64_SGISN_SHUB_H_ */