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

Timestamp:

Feb 8, 2015, 1:12:23 PM (9 years ago)

Author:

alain

Message:

1) Introduce access functions to MMC intrumentation registers.
2) Use _printf for error or debug messages.

File:

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

soft/giet_vm/giet_drivers/ioc_driver.c

@@ -67 +67 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-#define in_unckdata __attribute__((section (".unckdata")))
-
-in_unckdata volatile unsigned int _ioc_iommu_ix1 = 0;
-in_unckdata volatile unsigned int _ioc_iommu_npages; 
+__attribute__((section (".kdata")))
+volatile unsigned int _ioc_iommu_ix1 = 0;
+
+__attribute__((section (".kdata")))
+volatile unsigned int _ioc_iommu_npages; 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -96 +97 @@
 unsigned int y       = (procid >> P_WIDTH) & ((1<<Y_WIDTH)-1);
 unsigned int p       = procid & ((1<<P_WIDTH)-1);
-_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");
+_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 );
 #endif
 
@@ -140 +129 @@
 
     // computing memory buffer physical address
-    if ( (mode == IOC_BOOT_MODE) && ((_get_mmu_mode() & 0x4) == 0) ) // identity mapping
+    if ( (mode == IOC_BOOT_MODE) && ((_get_mmu_mode() & 0x4) == 0) ) // identity
     {
         buf_paddr = (paddr_t)buf_vaddr;
     }
-    else                                                    // V2P translation required
+    else                                                 // V2P translation required
     {
         // get page table virtual address
@@ -280 +269 @@
 #elif ( USE_IOC_RDK )
 
-    return rdk_get_status();
+    return _rdk_get_status();
 
 #endif