Changeset 631 for trunk/softs/giet_tsar

Timestamp:

Feb 12, 2014, 1:42:52 PM (11 years ago)

Author:

alain

Message:

Introducing support for RAMDISK in giet_tsar

File:

• trunk/softs/giet_tsar/stdio.c (modified) (7 diffs)

trunk/softs/giet_tsar/stdio.c

@@ -87 +87 @@
 extern struct plouf seg_ioc_base;
 extern struct plouf seg_mmc_base;
+extern struct plouf seg_ramdisk_base;
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -915 +916 @@
 //   BLOCK_DEVICE (IOC)
 //////////////////////////////////////////////////////////////////////////////////////////
+// The block size is 512 bytes.
 // The functions below use the three variables _ioc_lock _ioc_done, 
 // and _ioc_status for synchronisation.
@@ -933 +935 @@
 //  (x = X_SIZE-1 / y = Y_SIZE), which requires and extended address access. 
 //  If USE_EXT_IO not set, we use the IOC contrÃŽler in cluster (0,0).
+//
+//  If USE_RAMDISK is set, we access a "virtual" block device controler  implemented 
+//  as a memory-mapped segment in cluster [0,0] at address seg_ramdisk_base.
+//  The tranfer being fully synchronous, the IOC interrupt is not activated.
 ///////////////////////////////////////////////////////////////////////////////////////
 
@@ -967 +973 @@
     _ioc_get_lock();
 
-    if ( USE_EXT_IO )   // extended addressing to cluster_io
+    if ( USE_RAMDISK )  // we use an extended_memcpy
+    {
+        unsigned int  src_address = (unsigned int)buffer;
+        unsigned int  src_cluster = ext;
+        unsigned int  dst_address = (unsigned int)&seg_ramdisk_base + lba*512;
+        unsigned int  dst_cluster = 0;
+
+        _extended_memcpy( dst_cluster,
+                          dst_address,
+                          src_cluster,
+                          src_address,
+                          count*512 );
+        
+        _ioc_status = BLOCK_DEVICE_WRITE_SUCCESS;
+        _ioc_done   = 1;
+    }
+    else if ( USE_EXT_IO )   // extended addressing to cluster_io
     {
         unsigned int    cluster = ((X_SIZE-1)<<Y_WIDTH) + Y_SIZE;
@@ -1007 +1029 @@
     _ioc_get_lock();
 
-    if ( USE_EXT_IO )   // extended addressing to cluster_io
+    if ( USE_RAMDISK )  // we use an extended_memcpy
+    {
+        unsigned int  dst_address = (unsigned int)buffer;
+        unsigned int  dst_cluster = ext;
+        unsigned int  src_address = (unsigned int)&seg_ramdisk_base + lba*512;
+        unsigned int  src_cluster = 0;
+
+        _extended_memcpy( dst_cluster,
+                          dst_address,
+                          src_cluster,
+                          src_address,
+                          count*512 );
+
+        _ioc_status = BLOCK_DEVICE_READ_SUCCESS;
+        _ioc_done   = 1;
+    }
+    else if ( USE_EXT_IO )   // extended addressing to cluster_io
     {
         unsigned int    cluster = ((X_SIZE-1)<<Y_WIDTH) + Y_SIZE;
@@ -1081 +1119 @@
 
 //////////////////////////////////////////////////////////////////////////////////////
-//  This ISR must be executed when an IRQ is activated by MEMC to signal
-//  an error detected by the TSAR memory cache after a write transaction.
-//  It displays an error message on the TTY terminal allocated to the processor
-//  executing the ISR.
-//////////////////////////////////////////////////////////////////////////////////////
-in_drivers void _mmc_isr()
-{
-    int*         mmc_address = (int*)&seg_mmc_base;
-    unsigned int cluster_xy  = _procid() / NB_PROCS_MAX;
-    
-    _tty_printf( "WRITE ERROR signaled by Memory Cache in cluster %x\n", cluster_xy );
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
 //  FRAME_BUFFER
 //////////////////////////////////////////////////////////////////////////////////////
@@ -1150 +1174 @@
                       src_address,
                       length );
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+//  This ISR must be executed when an IRQ is activated by MEMC to signal
+//  an error detected by the TSAR memory cache after a write transaction.
+//  It displays an error message on the TTY terminal allocated to the processor
+//  executing the ISR.
+//////////////////////////////////////////////////////////////////////////////////////
+in_drivers void _mmc_isr()
+{
+    int*         mmc_address = (int*)&seg_mmc_base;
+    unsigned int cluster_xy  = _procid() / NB_PROCS_MAX;
+    
+    _tty_printf( "WRITE ERROR signaled by Memory Cache in cluster %x\n", cluster_xy );
 }