Index: /trunk/modules/vci_block_device_tsar_v4/caba/source/src/vci_block_device_tsar_v4.cpp
===================================================================
--- /trunk/modules/vci_block_device_tsar_v4/caba/source/src/vci_block_device_tsar_v4.cpp	(revision 227)
+++ /trunk/modules/vci_block_device_tsar_v4/caba/source/src/vci_block_device_tsar_v4.cpp	(revision 228)
@@ -162,5 +162,5 @@
     case M_IDLE : 	// waiting for activation
     {
-	if ( r_go ) 
+        if ( r_go ) 
         {
             r_block_count   = 0;
@@ -170,11 +170,11 @@
 
             if ( r_read ) 	r_initiator_fsm = M_READ_BLOCK;
-            else 		r_initiator_fsm = M_WRITE_CMD;
-        }
-        break;
-    }
-    case M_READ_BLOCK:  // read one block from block after waiting m_latency cycles
-    {
-        if(r_latency_count == 0)
+            else            r_initiator_fsm = M_WRITE_CMD;
+        }
+        break;
+    }
+    case M_READ_BLOCK:  // read one block from disk after waiting m_latency cycles
+    {
+        if ( r_latency_count == 0 )
         {
             r_latency_count = m_latency;
@@ -256,5 +256,5 @@
     case M_WRITE_CMD:	// This is actually a single flit VCI READ command
     {
-	if ( p_vci_initiator.cmdack.read() ) r_initiator_fsm = M_WRITE_RSP;
+	    if ( p_vci_initiator.cmdack.read() ) r_initiator_fsm = M_WRITE_RSP;
         break;
     }
@@ -267,11 +267,11 @@
             if ( p_vci_initiator.reop.read() )
             {
-	        r_flit_count = 0;
-		if( (p_vci_initiator.rerror.read()&0x1) == 0 ) r_initiator_fsm = M_WRITE_BLOCK;
+	            r_flit_count = 0;
+		        if( (p_vci_initiator.rerror.read()&0x1) == 0 ) r_initiator_fsm = M_WRITE_TEST;
                 else                                           r_initiator_fsm = M_WRITE_ERROR;
             }
             else
             {
-	        r_flit_count = r_flit_count.read() + 1;
+	            r_flit_count = r_flit_count.read() + 1;
             }
         }
@@ -285,6 +285,6 @@
             r_block_count = r_block_count.read() + 1;
             r_initiator_fsm = M_WRITE_BLOCK;
-        }							// not the last burst
-        else
+        }					
+        else                                                    // not the last burst
         {
             r_burst_count = r_burst_count.read() + 1;
@@ -329,5 +329,4 @@
     }
     } // end switch r_initiator_fsm
-
 }  // end transition