Changeset 437 for soft/giet_vm/giet_drivers/ioc_driver.c

Timestamp:

Nov 3, 2014, 10:53:00 AM (10 years ago)

Author:

alain

Message:

Introducing dynamic allocation of peripheral channel(TTY, NIC, TIM, CMA)
Removint the ICU driver : ICU component not supported anymore.
Removing the FBF driver.

File:

• soft/giet_vm/giet_drivers/ioc_driver.c (modified) (8 diffs)

soft/giet_vm/giet_drivers/ioc_driver.c

@@ -6 +6 @@
 // Copyright (c) UPMC-LIP6
 ///////////////////////////////////////////////////////////////////////////////////
-// Implementation note:
-//
+// Implementation notes:
 // 1) In order to share the code, the two _ioc_read() and _ioc_write() functions
-// call the same _ioc_access() function.
-//
+// call the same _ioc_access() function, and this function call the selected
+// physical driver (BDV / HBA / SPI / RDK).
 // 2) The IOMMU is not supported yet, but the method is the following:
 // A fixed size 2 Mbytes vseg is allocated to the IOC peripheral, in the I/O 
@@ -97 +96 @@
 unsigned int y       = (procid >> P_WIDTH) & ((1<<Y_WIDTH)-1);
 unsigned int p       = procid & ((1<<P_WIDTH)-1);
-_printf("\n[IOC DEBUG] _ioc_access() : P[%d,%d,%d] enters at cycle %d\n"
-        " - channel  = %d\n"
-        " - mode     = %d\n"
-        " - vaddr    = %x\n"
-        " - sectors  = %d\n"
-        " - lba      = %x\n",
-        x, y, p, _get_proctime(), channel, mode, buf_vaddr, count, lba );
+_puts("\n[IOC DEBUG] _ioc_access() : P[");
+_putd( x );
+_puts(",");
+_putd( y );
+_puts(",");
+_putd( p );
+_puts("] enters at cycle ");
+_putd( _get_proctime() );
+_puts("\n - channel  = ");
+_putd( channel );
+_puts("\n - mode     = ");
+_putd( mode );
+_puts("\n - vaddr    = ");
+_putx( buf_vaddr );
+_puts("\n - sectors  = ");
+_putd( count );
+_puts("\n - lba      = ");
+_putx( lba );
+_puts("\n");
 #endif
 
@@ -115 +126 @@
     if ((unsigned int) buf_vaddr & 0x3)
     {
-        _printf("\n[IOC ERROR] in _ioc_access() : buffer not word aligned\n");
+        _puts("\n[IOC ERROR] in _ioc_access() : buffer not word aligned\n");
         _exit(); 
     }
@@ -122 +133 @@
     if ( (USE_IOC_HBA == 0) && (channel > 0) )
     {
-        _printf("\n[IOC ERROR] in _ioc_access() : channel must be 0 when HBA not used\n");
+        _puts("\n[IOC ERROR] in _ioc_access() : channel must be 0 when HBA not used\n");
         _exit(); 
     }
@@ -146 +157 @@
         if ( ko )
         {
-            _printf("\n[IOC ERROR] in _ioc_access() : buffer unmapped\n");
+            _puts("\n[IOC ERROR] in _ioc_access() : buffer unmapped\n");
             _exit(); 
         }
@@ -152 +163 @@
         if ( (mode == IOC_USER_MODE) && ((flags & PTE_U) == 0) )
         {
-            _printf("\n[IOC ERROR] in _ioc_access() : buffer not user accessible\n");
+            _puts("\n[IOC ERROR] in _ioc_access() : buffer not user accessible\n");
             _exit(); 
         }
@@ -158 +169 @@
         if ( ((flags & PTE_W) == 0 ) && to_mem )
         {
-            _printf("\n[IOC ERROR] in _ioc_access() : buffer not writable\n");
+            _puts("\n[IOC ERROR] in _ioc_access() : buffer not writable\n");
             _exit(); 
         }
@@ -274 +285 @@
 #elif ( USE_IOC_RDK )
 
-    _printf("[GIET ERROR] _ioc_get_status() should not be called");
-    _printf(" when RAMDISK  is used...\n");
-    _exit();
-
-    return 0;
+    return rdk_get_status();
 
 #endif