Index: /soft/giet_vm/giet_drivers/cma_driver.c
===================================================================
--- /soft/giet_vm/giet_drivers/cma_driver.c	(revision 611)
+++ /soft/giet_vm/giet_drivers/cma_driver.c	(revision 612)
@@ -52,12 +52,15 @@
         _puts("impossible access to source chbuf descriptor\n");
 
-    else if (status == CHANNEL_SRC_DATA_ERROR )
-        _puts("impossible access to source data buffer\n");
+    else if (status == CHANNEL_SRC_STATUS_ERROR )
+        _puts("impossible access to source buffer status\n");
 
     else if (status == CHANNEL_DST_DESC_ERROR )
         _puts("impossible access to destination chbuf descriptor\n");
 
-    else if (status == CHANNEL_DST_DATA_ERROR )
-        _puts("impossible access to destination data buffer\n");
+    else if (status == CHANNEL_DST_STATUS_ERROR )
+        _puts("impossible access to destination buffer status\n");
+
+    else if (status == CHANNEL_DATA_ERROR )
+        _puts("impossible access to source or destination data buffer\n");
 
     else
Index: /soft/giet_vm/giet_drivers/cma_driver.h
===================================================================
--- /soft/giet_vm/giet_drivers/cma_driver.h	(revision 611)
+++ /soft/giet_vm/giet_drivers/cma_driver.h	(revision 612)
@@ -54,32 +54,29 @@
     CHANNEL_IDLE,
 
-    CHANNEL_SRC_DATA_ERROR,
-    CHANNEL_DST_DATA_ERROR,
+    CHANNEL_DATA_ERROR,
     CHANNEL_SRC_DESC_ERROR,
     CHANNEL_DST_DESC_ERROR,
+    CHANNEL_SRC_STATUS_ERROR,
+    CHANNEL_DST_STATUS_ERROR,
 
+    CHANNEL_READ_SRC_DESC,
+    CHANNEL_READ_SRC_DESC_WAIT,
     CHANNEL_READ_SRC_STATUS,
     CHANNEL_READ_SRC_STATUS_WAIT,
     CHANNEL_READ_SRC_STATUS_DELAY,
-    CHANNEL_READ_SRC_BUFADDR,
-    CHANNEL_READ_SRC_BUFADDR_WAIT,
 
+    CHANNEL_READ_DST_DESC,
+    CHANNEL_READ_DST_DESC_WAIT,
     CHANNEL_READ_DST_STATUS,
     CHANNEL_READ_DST_STATUS_WAIT,
     CHANNEL_READ_DST_STATUS_DELAY,
-    CHANNEL_READ_DST_BUFADDR,
-    CHANNEL_READ_DST_BUFADDR_WAIT,
 
-    CHANNEL_READ_BURST,
-    CHANNEL_READ_REQ_FIRST,
-    CHANNEL_READ_WAIT_FIRST,
-    CHANNEL_READ_REQ_SECOND,
-    CHANNEL_READ_WAIT_SECOND,
-
-    CHANNEL_WRITE_BURST,
-    CHANNEL_WRITE_REQ_FIRST,
-    CHANNEL_WRITE_WAIT_FIRST,
-    CHANNEL_WRITE_REQ_SECOND,
-    CHANNEL_WRITE_WAIT_SECOND,
+    CHANNEL_BURST,
+    CHANNEL_READ_REQ,
+    CHANNEL_READ_REQ_WAIT,
+    CHANNEL_RSP_WAIT,
+    CHANNEL_WRITE_REQ,
+    CHANNEL_WRITE_REQ_WAIT,
+    CHANNEL_BURST_RSP_WAIT,
 
     CHANNEL_SRC_STATUS_WRITE,
@@ -87,6 +84,5 @@
     CHANNEL_DST_STATUS_WRITE,
     CHANNEL_DST_STATUS_WRITE_WAIT,
-    CHANNEL_SRC_NEXT_BUFFER,
-    CHANNEL_DST_NEXT_BUFFER,
+    CHANNEL_NEXT_BUFFERS,
 };