Changeset 322 for soft/giet_vm/giet_kernel/irq_handler.c

Timestamp:

Jun 10, 2014, 1:28:14 PM (10 years ago)

Author:

alain

Message:

Various small modifs to comply with the genmap tool.

File:

• soft/giet_vm/giet_kernel/irq_handler.c (modified) (4 diffs)

soft/giet_vm/giet_kernel/irq_handler.c

@@ -19 +19 @@
 #include <bdv_driver.h>
 #include <dma_driver.h>
+#include <spi_driver.h>
 #include <mapping_info.h>
 #include <utils.h>
 
-#if !defined( USE_XICU )
-# error: You must define USE_XICU in the hard_config.h file
+#if !defined( USE_XCU )
+# error: You must define USE_XCU in the hard_config.h file
 #endif
 
@@ -60 +61 @@
     unsigned int icu_out_index = lpid * IRQ_PER_PROCESSOR;
 
-#if USE_XICU
+#if USE_XCU
     _xcu_get_index( cluster_xy, icu_out_index, &irq_id, &irq_type );
 #else
@@ -118 +119 @@
         else if ( isr_type == ISR_TIMER  ) _timer_isr  ( irq_type, irq_id, channel );
         else if ( isr_type == ISR_MMC    ) _mmc_isr    ( irq_type, irq_id, channel );
+        else if ( isr_type == ISR_DMA    ) _dma_isr    ( irq_type, irq_id, channel );
+        else if ( isr_type == ISR_SPI    ) _spi_isr    ( irq_type, irq_id, channel );
         else
         {
@@ -146 +149 @@
     unsigned int lpid       = gpid % NB_PROCS_MAX;
 
-    // We don't take TTY lock to avoid deadlock
-    _puts("\n[GIET WARNING] IRQ handler called but no active IRQ on processor[");
-    _putd( x );
-    _puts(",");
-    _putd( y );
-    _puts(",");
-    _putd( lpid );
-    _puts("] at cycle ");
-    _putd( _get_proctime() );
-    _puts("\n  ");
+    _printf("\n[GIET WARNING] IRQ handler called but no active IRQ "
+            "on processor[%d,%d,%d] at cycle %d\n",
+            x, y, lpid, _get_proctime() );
 }