Changeset 965dc18 in mainline for kernel/arch/sparc64/src/trap/interrupt.c

Timestamp:

2008-12-05T19:59:03Z (15 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/src/trap/interrupt.c (modified) (1 diff)

kernel/arch/sparc64/src/trap/interrupt.c

@@ -68 +68 @@
 void interrupt(int n, istate_t *istate)
 {
+        uint64_t status;
         uint64_t intrcv;
         uint64_t data0;
+        status = asi_u64_read(ASI_INTR_DISPATCH_STATUS, 0);
+        if (status & (!INTR_DISPATCH_STATUS_BUSY))
+                panic("Interrupt Dispatch Status busy bit not set\n");
 
         intrcv = asi_u64_read(ASI_INTR_RECEIVE, 0);
-        data0 = asi_u64_read(ASI_UDB_INTR_R, ASI_UDB_INTR_R_DATA_0);
+#if defined (US)
+        data0 = asi_u64_read(ASI_INTR_R, ASI_UDB_INTR_R_DATA_0);
+#elif defined (US3)
+        data0 = asi_u64_read(ASI_INTR_R, VA_INTR_R_DATA_0);
+#endif
 
         irq_t *irq = irq_dispatch_and_lock(data0);