Changeset 7633928c in mainline

Timestamp:

2012-12-19T20:53:05Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3c50cddc

Parents:

a4f959b

Message:

#ifdef parts applicable only to msim.

Location:

kernel/arch/mips32

Files:

• Makefile.inc (modified) (1 diff)
• src/interrupt.c (modified) (5 diffs)

kernel/arch/mips32/Makefile.inc

@@ -69 +69 @@
         arch/$(KARCH)/src/fpu_context.c \
         arch/$(KARCH)/src/ddi/ddi.c \
-        arch/$(KARCH)/src/smp/dorder.c \
         arch/$(KARCH)/src/smp/smp.c
+
+ifeq ($(MACHINE),msim)
+        ARCH_SOURCES += \
+                arch/$(KARCH)/src/smp/dorder.c
+endif
+

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
 }