Changeset 333 for soft/giet_vm/giet_drivers/dma_driver.c

Timestamp:

Jun 19, 2014, 1:31:45 PM (10 years ago)

Author:

alain

Message:

Cosmetic

File:

• soft/giet_vm/giet_drivers/dma_driver.c (modified) (8 diffs)

soft/giet_vm/giet_drivers/dma_driver.c

@@ -21 +21 @@
 //
 // The virtual base address of the segment associated to a channel is:
-//    SEG_DMA_BASE + cluster_xy * vseg_cluster_increment + DMA_SPAN * channel_id
+//    SEG_DMA_BASE + cluster_xy * PERI_CLUSTER_INCREMENT + DMA_SPAN * channel_id
 //
 // The SEG_DMA_BASE virtual address mus be defined in the hard_config.h file.
@@ -57 +57 @@
 #endif
 
-#if !defined(VSEG_CLUSTER_INCREMENT) 
-# error: You must define VSEG_CLUSTER_INCREMENT in the hard_config.h file
+#if !defined(PERI_CLUSTER_INCREMENT) 
+# error: You must define PERI_CLUSTER_INCREMENT in the hard_config.h file
 #endif
 
@@ -83 +83 @@
     // compute DMA base address
     unsigned int* dma_address = (unsigned int*) ( SEG_DMA_BASE + 
-                                (cluster_xy * VSEG_CLUSTER_INCREMENT) );
+                                (cluster_xy * PERI_CLUSTER_INCREMENT) );
 
     // disable interrupt for selected channel
@@ -111 +111 @@
     // compute DMA base address
     unsigned int* dma_address = (unsigned int*) ( SEG_DMA_BASE + 
-                                (cluster_xy * VSEG_CLUSTER_INCREMENT) );
+                                (cluster_xy * PERI_CLUSTER_INCREMENT) );
 
     // reset selected channel
@@ -138 +138 @@
     // compute DMA base address
     unsigned int * dma_address = (unsigned int *) ( SEG_DMA_BASE + 
-                                 (cluster_xy * VSEG_CLUSTER_INCREMENT) );
+                                 (cluster_xy * PERI_CLUSTER_INCREMENT) );
 
     // get selected channel status
@@ -169 +169 @@
     // compute DMA base address
     unsigned int * dma_address = (unsigned int *) ( SEG_DMA_BASE + 
-                                 (cluster_xy * VSEG_CLUSTER_INCREMENT) );
+                                 (cluster_xy * PERI_CLUSTER_INCREMENT) );
 
     // selected channel configuration and lauching
@@ -308 +308 @@
 
 #else // NB_DMA_CHANNELS == 0
-    _printf("\n[GIET ERROR] in _dma_copy() : NB_DMA_CHANNELS = 0 !\n");
+    _printf("\n[GIET ERROR] in _dma_copy() : NB_DMA_CHANNELS == 0 / cycle %d\n",
+            _get_proctime );
     _exit();
 #endif
@@ -320 +321 @@
                unsigned int channel )
 {
-    _printf("\n[GIET ERROR] _dma_isr() not implemented\n");
+    _printf("\n[GIET ERROR] _dma_isr() not implemented / cycle %d\n",
+            _get_proctime() );
     _exit();
 }