Changeset 754 for soft/giet_vm/giet_drivers

Timestamp:

Jan 7, 2016, 4:12:54 PM (9 years ago)

Author:

cfuguet

Message:

• Support to have a single terminal (NB_TTY_CHANNEL = 1). In this case, the terminal is shared by the system and the applications.

• Support platforms without NIC and CMA.

• In the MMC driver, do not initialize the distributed driver structure in clusters without memory cache (IO clusters in the LETI platform).

Location:

soft/giet_vm/giet_drivers

Files:

• mmc_driver.c (modified) (2 diffs)
• rdk_driver.c (modified) (2 diffs)

soft/giet_vm/giet_drivers/mmc_driver.c

@@ -10 +10 @@
 #include <tty0.h>
 #include <kernel_locks.h>
+#include <kernel_malloc.h>
 #include <utils.h>
 
@@ -80 +81 @@
             else
             {
+                // get heap_base & heap size
+                unsigned int heap_base;
+                unsigned int heap_size;
+                if ( _get_heap_info( &heap_base, &heap_size, x, y ) ) continue;
+
                 _mmc_distributed_lock[x][y] = _remote_malloc( sizeof(spin_lock_t), x, y );
                 _spin_lock_init( _mmc_distributed_lock[x][y] );

soft/giet_vm/giet_drivers/rdk_driver.c

@@ -26 +26 @@
 #if USE_IOC_RDK
 
-#if GIET_DEBUG_IOC_DRIVER
+#if GIET_DEBUG_IOC
 unsigned int procid  = _get_procid();
 unsigned int x       = procid >> (Y_WIDTH + P_WIDTH);
@@ -37 +37 @@
 
     char* rdk = (char*)SEG_RDK_BASE + (512*lba);
-    char* buf = (char*)buf_paddr;
+    char* buf = (char*)buf_vaddr;
 
     if ( to_mem ) memcpy( buf, rdk, count*512 );