Date: Sat, 4 Jan 2014 23:48:20 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260308 - projects/altix2/sys/ia64/sgisn Message-ID: <201401042348.s04NmKrH065143@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401042348.s04NmKrH065143>