Changeset 529 for soft/giet_vm/giet_drivers/rdk_driver.c

Timestamp:

Mar 27, 2015, 11:51:33 AM (10 years ago)

Author:

alain

Message:

1) Removing the IOC driver (integrated in the FAT library).
2) Simplifying the BDV, HBA, SDC, RDK drivers: they support
only two modes (synchronous => polling / descheduling => IRQ),
and only one access function (for both read/write).

File:

• soft/giet_vm/giet_drivers/rdk_driver.c (modified) (3 diffs)

soft/giet_vm/giet_drivers/rdk_driver.c

@@ -1 @@
-///////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 // File      : rdk_driver.c
 // Date      : 13/02/2014
@@ -5 +5 @@
 // Maintainer: cesar fuguet
 // Copyright (c) UPMC-LIP6
-///////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 
 #include <giet_config.h>
@@ -17 +17 @@
 #endif
 
-//////////////////////////////////////////////
-unsigned int _rdk_init( unsigned int channel )
-{
-    return 0;
-}
-
-//////////////////////////////////////////
-unsigned int _rdk_read( unsigned int lba, 
-                        unsigned int buffer, 
-                        unsigned int count) 
+/////////////////////////////////////////////////////
+unsigned int _rdk_access( unsigned int       use_irq,    // not used
+                          unsigned int       to_mem,
+                          unsigned int       lba, 
+                          unsigned long long buf_vaddr,  // actually vaddr
+                          unsigned int       count) 
 {
 #if USE_IOC_RDK
 
 #if GIET_DEBUG_IOC_DRIVER
-_puts("\n[IOC DEBUG] Enter _rdk_read() at cycle ");
-_putd( _get_proctime() );
-_puts("\n - vaddr   = "); 
-_putx( buffer );
--puts("\n - sectors = "); 
-_putd( count );
--puts("\n - lba     = "); 
-_putx( lba );
-_puts("\n");
+unsigned int procid  = _get_procid();
+unsigned int x       = procid >> (Y_WIDTH + P_WIDTH);
+unsigned int y       = (procid >> P_WIDTH) & ((1<<Y_WIDTH) - 1);
+unsigned int p       = procid & ((1<<P_WIDTH)-1);
+_printf("\n[RDK DEBUG] P[%d,%d,%d] enters _rdk_access at cycle %d\n"
+        "  use_irq = %d / to_mem = %d / lba = %x / paddr = %x / count = %d\n",
+        x , y , p , _get_proctime() , use_irq , to_mem , lba , buf_vaddr, count );
 #endif
 
-    char* src = (char*)SEG_RDK_BASE + (512*lba);
-    char* dst = (char*)buffer;
-    memcpy( dst, src, count*512 );
+    char* rdk = (char*)SEG_RDK_BASE + (512*lba);
+    char* buf = (char*)buf_paddr;
+
+    if ( to_mem ) memcpy( buf, rdk, count*512 );
+    else          memcpy( rdk, buf, count*512 );
+
     return 0;
 
 #else
 
-    _puts("[GIET ERROR] _rdk_read() should not be used if USE_IOC_RDK not set\n");
+    _printf("[RDK ERROR] _rdk_access() but USE_IOC_RDK not set\n");
     return 1;
 
 #endif
 }
-
-//////////////////////////////////////////
-unsigned int _rdk_write( unsigned int lba, 
-                         unsigned int buffer, 
-                         unsigned int count ) 
-{
-#if USE_IOC_RDK
-
-#if GIET_DEBUG_IOC_DRIVER
-_puts("\n[IOC DEBUG] Enter _rdk_write() at cycle ");
-_putd( _get_proctime() );
-_puts("\n - vaddr   = "); 
-_putx( buffer );
--puts("\n - sectors = "); 
-_putd( count );
--puts("\n - lba     = "); 
-_putx( lba );
-_puts("\n");
-#endif
-
-    char* dst = (char*)SEG_RDK_BASE + (512*lba);
-    char* src = (char*)buffer;
-    memcpy( dst, src, count*512 );
-    return 0;
-
-#else
-
-    _puts("[GIET ERROR] _rdk_write() should not be used if USE_IOC_RDK not set\n");
-    return 1;
-
-#endif
-}
-
-//////////////////////////////////
-unsigned int _rdk_get_block_size() 
-{
-    return 512;
-}
-
-//////////////////////////////
-unsigned int _rdk_get_status() 
-{
-    return 0;
-}
-
 
 // Local Variables: