Changeset 965dc18 in mainline for kernel/arch/sparc64/include/trap/interrupt.h

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

• kernel/arch/sparc64/include/trap/interrupt.h (modified) (1 diff)

kernel/arch/sparc64/include/trap/interrupt.h

@@ -50 +50 @@
 
 /* Interrupt ASI registers. */
-#define ASI_UDB_INTR_W                  0x77
+#define ASI_INTR_W                      0x77
 #define ASI_INTR_DISPATCH_STATUS        0x48
-#define ASI_UDB_INTR_R                  0x7f
+#define ASI_INTR_R                      0x7f
 #define ASI_INTR_RECEIVE                0x49
 
-/* VA's used with ASI_UDB_INTR_W register. */
+/* VA's used with ASI_INTR_W register. */
+#if defined (US)
 #define ASI_UDB_INTR_W_DATA_0   0x40
 #define ASI_UDB_INTR_W_DATA_1   0x50
 #define ASI_UDB_INTR_W_DATA_2   0x60
-#define ASI_UDB_INTR_W_DISPATCH 0x70
+#elif defined (US3)
+#define VA_INTR_W_DATA_0        0x40
+#define VA_INTR_W_DATA_1        0x48
+#define VA_INTR_W_DATA_2        0x50
+#define VA_INTR_W_DATA_3        0x58
+#define VA_INTR_W_DATA_4        0x60
+#define VA_INTR_W_DATA_5        0x68
+#define VA_INTR_W_DATA_6        0x80
+#define VA_INTR_W_DATA_7        0x88
+#endif
+#define VA_INTR_W_DISPATCH      0x70
 
-/* VA's used with ASI_UDB_INTR_R register. */
+/* VA's used with ASI_INTR_R register. */
+#if defined(US)
 #define ASI_UDB_INTR_R_DATA_0   0x40
 #define ASI_UDB_INTR_R_DATA_1   0x50
 #define ASI_UDB_INTR_R_DATA_2   0x60
+#elif defined (US3)
+#define VA_INTR_R_DATA_0        0x40
+#define VA_INTR_R_DATA_1        0x48
+#define VA_INTR_R_DATA_2        0x50
+#define VA_INTR_R_DATA_3        0x58
+#define VA_INTR_R_DATA_4        0x60
+#define VA_INTR_R_DATA_5        0x68
+#define VA_INTR_R_DATA_6        0x80
+#define VA_INTR_R_DATA_7        0x88
+#endif
 
 /* Shifts in the Interrupt Vector Dispatch virtual address. */