Changeset b183ce0a in mainline for kernel/arch/mips32/src/interrupt.c

Timestamp:

2013-03-24T15:34:29Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8a26f82

Parents:

b92a0ee (diff), 119b46e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/mips32/src/interrupt.c (modified) (5 diffs)

kernel/arch/mips32/src/interrupt.c

@@ -45 +45 @@
 #define IRQ_COUNT   8
 #define TIMER_IRQ   7
+
+#ifdef MACHINE_msim
 #define DORDER_IRQ  5
+#endif
 
 function virtual_timer_fnc = NULL;
 static irq_t timer_irq;
+
+#ifdef MACHINE_msim
 static irq_t dorder_irq;
+#endif
 
 // TODO: This is SMP unsafe!!!
@@ -151 +157 @@
 }
 
+#ifdef MACHINE_msim
 static irq_ownership_t dorder_claim(irq_t *irq)
 {
@@ -160 +167 @@
         dorder_ipi_ack(1 << dorder_cpuid());
 }
+#endif
 
 /* Initialize basic tables for exception dispatching */
@@ -176 +184 @@
         cp0_unmask_int(TIMER_IRQ);
         
+#ifdef MACHINE_msim
         irq_initialize(&dorder_irq);
         dorder_irq.devno = device_assign_devno();
@@ -184 +193 @@
         
         cp0_unmask_int(DORDER_IRQ);
+#endif
 }