svn commit: r202229 - stable/7/sys/sparc64/include

[Marius Strobl]

Author: marius
Date: Wed Jan 13 20:07:46 2010
New Revision: 202229
URL: http://svn.freebsd.org/changeset/base/202229

Log:
  MFC: r200878
  
  - Add macros for the states of the interrupt clear registers.
  - Change INTMAP_VEC() to take an INO as its second argument rather
    than an INR. The former is what I actually intended with this
    macro and how it's currently used.

Modified:
  stable/7/sys/sparc64/include/bus_common.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sparc64/include/bus_common.h
==============================================================================
--- stable/7/sys/sparc64/include/bus_common.h	Wed Jan 13 20:07:45 2010	(r202228)
+++ stable/7/sys/sparc64/include/bus_common.h	Wed Jan 13 20:07:46 2010	(r202229)
@@ -39,6 +39,10 @@
 #ifndef _MACHINE_BUS_COMMON_H_
 #define	_MACHINE_BUS_COMMON_H_
 
+#define	INTCLR_PENDING		0x000000003ULL	/* Interrupt queued to CPU */
+#define	INTCLR_RECEIVED		0x000000001ULL	/* Interrupt received */
+#define	INTCLR_IDLE		0x000000000ULL	/* Interrupt idle */
+
 #define	INTMAP_V		0x080000000ULL	/* Interrupt valid (enabled) */
 #define	INTMAP_TID_MASK		0x07c000000ULL	/* UPA target ID */
 #define	INTMAP_TID_SHIFT	26
@@ -60,9 +64,9 @@
 	(INTMAP_TID((mr), (mid)) | INTMAP_V)
 #define	INTMAP_TID(mr, mid)						\
 	(((mr) & ~INTMAP_TID_MASK) | ((mid) << INTMAP_TID_SHIFT))
-#define	INTMAP_VEC(ign, inr)						\
+#define	INTMAP_VEC(ign, ino)						\
 	((((ign) << INTMAP_IGN_SHIFT) & INTMAP_IGN_MASK) |		\
-	((inr) & INTMAP_INR_MASK))
+	((ino) & INTMAP_INO_MASK))
 
 /* counter-timer support. */
 void sparc64_counter_init(const char *name, bus_space_tag_t tag,