Changeset 254 for soft/giet_vm/display/main.c

Timestamp:

Aug 27, 2013, 5:41:51 PM (11 years ago)

Author:

alain

Message:

Improving support for Chained Buffer DMA in drivers.c file.

File:

• soft/giet_vm/display/main.c (modified) (2 diffs)

soft/giet_vm/display/main.c

@@ -1 +1 @@
 #include <stdio.h>
 
-#define NBLOCS 32   // (128 * 128) / 512
+#define NBLOCKS 32   // number of blocks per image (128 * 128) / 512
 
-unsigned char buf[128*128] __attribute__((aligned(64)));
+unsigned char buf0[128*128] __attribute__((aligned(64)));
+unsigned char buf1[128*128] __attribute__((aligned(64)));
 
 __attribute__((constructor)) int main(void)
@@ -10 +11 @@
     unsigned int  base = 0;
 
-    while (base < 10 * NBLOCS)
+    /* initialise CDMA transfert (double buffer) */
+
+    giet_tty_printf( "*** Starting task DISPLAY_CMA on processor %d at cycle %d\n",
+                     giet_procid(), giet_proctime() );
+    giet_tty_printf( "  - buf0 address (LSB) = %x\n", (unsigned int)buf0 );
+    giet_tty_printf( "  - buf1 address (LSB) = %x\n", (unsigned int)buf1 );
+
+    x = giet_fb_cma_init( buf0,       // buf0 base address
+                          buf1,       // buf1 base address
+                          128*128 );  // buffer size (bytes)
+    giet_assert( (x==0), "echec giet_fb_cdma_init" );
+
+    while (base < 10 * NBLOCKS)
     {
-        giet_tty_printf("\n *** image %d *** at date = %d \n",
-                base / NBLOCS, giet_proctime());
+        /* Phase 1 : transfer one image from disk to buf0 and display  */
 
-        /* Phase 1 : lecture image sur le disque et transfert vers buf */
-        x = giet_ioc_read(base, buf, NBLOCS);
-        if ( x )
-        {
-            giet_tty_printf("echec giet_ioc_read = %d at date : %d\n", x , giet_proctime() );
-            giet_exit();
-        }
+        giet_tty_printf( "\n *** image %d *** at date = %d \n",
+                         (base/NBLOCKS), giet_proctime() );
+
+        x = giet_ioc_read( base,            // lba on disk
+                           buf0,            // user buffer address
+                           NBLOCKS );       // number of blocks
+        giet_assert( (x==0) , "echec giet_ioc_read for buf0" );
+
         x = giet_ioc_completed();
-        if ( x )
-        {
-            giet_tty_printf("echec giet_ioc_completed = %d at date : %d\n", x, giet_proctime() );
-            giet_exit();
-        }
-        giet_tty_printf("ioc_read  completed at date = %d \n", giet_proctime());
+        giet_assert( (x==0) , "echec giet_ioc_completed for buf0" );
 
-        // Phase 2 : transfert de buf vers le frame buffer par dma 
-        x = giet_fb_sync_write(0, buf, 128 * 128);
-        if ( x )
-        {
-            giet_tty_printf("echec giet_fb_write = %d at date : %d\n", x, giet_proctime() );
-            giet_exit();
-        }
+        giet_tty_printf( "ioc_read buf0 completed at date = %d \n", giet_proctime() );
 
-/*
-        giet_tty_printf("fb_write ok at date : %d\n", giet_proctime() );
+        x = giet_fb_cma_write( 0 );         // buf0
+        giet_assert( (x==0) , "echec giet_fb_cma_write for buf0" );
+        
+        base = base + NBLOCKS;
 
-        x = giet_fb_completed();
-        if ( x )
-        {
-            giet_tty_printf("echec giet_fb_completed = %d at date : %d\n", x, giet_proctime() );
-            giet_exit();
-        }
-*/
-        giet_tty_printf("display completed at date = %d \n", giet_proctime());
+        /* Phase 2 : transfer one image from disk to buf1 and display  */
 
-        base = base + NBLOCS;
-    }
+        giet_tty_printf( "\n *** image %d *** at date = %d \n",
+                         (base/NBLOCKS), giet_proctime() );
 
+        x = giet_ioc_read( base,            // lba on disk
+                           buf1,            // user buffer address
+                           NBLOCKS );       // number of locks
+        giet_assert( (x==0) , "echec giet_ioc_read for buf1");
+
+        x = giet_ioc_completed();
+        giet_assert( (x==0) , "echec giet_ioc_completed for buf1");
+
+        giet_tty_printf( "ioc_read buf1 completed at date = %d \n", giet_proctime() );
+
+        x = giet_fb_cma_write( 1 );         // buf1
+        giet_assert( (x==0) , "echec giet_fb_cma_write for buf1" );
+        
+        base = base + NBLOCKS;
+    } // end while
+
+    giet_fb_cma_stop();
     giet_exit();
-
     return 0;
 }