Changeset 547 for soft/giet_vm/giet_kernel/sys_handler.c

Timestamp:

Apr 5, 2015, 12:09:09 AM (10 years ago)

Author:

alain

Message:

Move the peripheral initialisation from the boot.c to the kernel_init.c

File:

• soft/giet_vm/giet_kernel/sys_handler.c (modified) (9 diffs)

soft/giet_vm/giet_kernel/sys_handler.c

@@ -22 +22 @@
 #include <giet_config.h>
 #include <mapping_info.h>
+#include <irq_handler.h>
 #include <io.h>
 
@@ -517 +518 @@
     else
     {
-        _set_context_slot( CTX_TTY_ID, channel );
-        return 0;
-    }
+    }
+
+    // allocate a WTI mailbox to the calling proc if external IRQ
+    unsigned int unused;
+    if ( USE_PIC ) _ext_irq_alloc( ISR_TTY_RX , channel , &unused ); 
+   
+    // update calling task index
+    _set_context_slot( CTX_TTY_ID, channel );
+
+    return 0;
 }
 
@@ -700 +708 @@
 unsigned int thread  = _get_context_slot( CTX_TRDID_ID );
 _printf("\n[GIET DEBUG NIC] Task %d enters sys_nic_alloc() at cycle %d\n"
-        " nic_channel = %d / cma_channel = %d\n"
+        "  nic_channel = %d / cma_channel = %d\n",
         thread , _get_proctime() , nic_channel , cma_channel );
 #endif
@@ -754 +762 @@
 
 #if GIET_DEBUG_NIC
-_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_start()"
-        " allocates container in cluster[%d,%d] : vaddr = %x / paddr = %l\n",
+_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_alloc()"
+        " allocates container in cluster[%d,%d]\n"
+        "  vaddr = %x / paddr = %l\n",
         thread , cx , cy , vaddr , cont_paddr );
 #endif
@@ -781 +790 @@
 
 #if GIET_DEBUG_NIC
-_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_start()"
-        " get NIC chbuf : paddr = %l\n",
+_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_alloc() get NIC chbuf : paddr = %l\n",
         thread , nic_chbuf_pbase );
 #endif
@@ -793 +801 @@
 
 #if GIET_DEBUG_NIC
-_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_start()"
-        " get kernel chbuf : vaddr = %x / paddr = %l\n",
+_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_alloc() get kernel chbuf\n"
+        "  vaddr = %x / paddr = %l\n",
         thread , vaddr , ker_chbuf_pbase );
 #endif
@@ -851 +859 @@
 #if GIET_DEBUG_NIC
 unsigned int thread  = _get_context_slot( CTX_TRDID_ID );
-_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_start() at cycle %d"
-        " get NIC channel = %d / CMA channel = %d\n",
+_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_start() at cycle %d\n"
+        "  get NIC channel = %d / CMA channel = %d\n",
         thread, _get_proctime(), nic_channel, cma_channel );
 #endif
@@ -969 +977 @@
 
 #if GIET_DEBUG_NIC
-_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_move() read buffer descriptor %d\n"
-        " at cycle = %d / paddr = %l / buffer descriptor = %l\n",
+_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_move() read buf_desc %d at cycle %d\n"
+        "  paddr = %l / buffer descriptor = %l\n",
         thread, index, _get_proctime(), buffer_desc_paddr, buffer_descriptor );
 #endif
@@ -993 +1001 @@
                           NIC_CONTAINER_SIZE );
 #if GIET_DEBUG_NIC
-_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_move() transfer "
-        "kernel buffer %l to user buffer %l at cycle %d\n",
+_printf("\n[GIET DEBUG NIC] Task %d in _sys_nic_move() transfer kernel buffer %l\n"
+        " to user buffer %l at cycle %d\n",
         thread , kernel_buffer_paddr , user_buffer_paddr , _get_proctime() );
 #endif