Changeset 724 for soft/giet_vm/applications/display

Timestamp:

Nov 21, 2015, 2:25:14 PM (9 years ago)

Author:

alain

Message:

Update graphical applications.

Location:

soft/giet_vm/applications/display

Files:

• display.c (modified) (4 diffs)
• display.py (modified) (1 diff)

soft/giet_vm/applications/display/display.c

@@ -66 +66 @@
     giet_fbf_alloc();
 
-    // get a Chained Buffer DMA channel
-    giet_fbf_cma_alloc();
+    // get a Chained Buffer DMA channel for two user buffers
+    giet_fbf_cma_alloc( 2 );
 
-    // initialize the source and destination chbufs
-    giet_fbf_cma_init_buf( buf0 , buf1 , sts0 , sts1 );
+    // register the two user buffers
+    giet_fbf_cma_init_buf( 0 , buf0 , sts0 );
+    giet_fbf_cma_init_buf( 1 , buf1 , sts1 );
 
-    // start Chained Buffer DMA channel
-    giet_fbf_cma_start( NPIXELS*NLINES );
+    // start CMA peripheral 
+    giet_fbf_cma_start();
     
     giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] starts CMA at cycle %d\n", 
@@ -81 +82 @@
     while ( 1 )
     {
-        // load buf0
-        giet_fat_read( fd, buf0, NPIXELS*NLINES );
-
-        giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] load image %d at cycle %d\n", 
-                        x, y, p, image, giet_proctime() );
-
-        // display buf0
-        giet_fbf_cma_display( 0 );
+        //////   handling buf0
+        giet_fbf_cma_check( 0 );                       // check buf0 empty
+        giet_fat_read( fd, buf0, NPIXELS*NLINES );     // load buf0 from disk
+        giet_fbf_cma_display( 0 );                     // display buf0
 
         giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] display image %d at cycle %d\n", 
                         x, y, p, image, giet_proctime() );
-
         image++;
 
@@ -98 +94 @@
         {
             image = 0;
-            giet_fat_lseek( fd , 0 , 0 );
+            giet_fat_lseek( fd , 0 , SEEK_SET );
         }
 
         if ( INTERACTIVE ) giet_tty_getc( &byte );
 
-        // load buf1
-        giet_fat_read( fd, buf1, NPIXELS*NLINES );
-
-        giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] load image %d at cycle %d\n", 
-                        x, y, p, image, giet_proctime() );
-
-        // display buf1
-        giet_fbf_cma_display( 1 );
+        //////   handling buf1
+        giet_fbf_cma_check( 1 );                       // check buf1 empty
+        giet_fat_read( fd, buf1, NPIXELS*NLINES );     // load buf1 from disk
+        giet_fbf_cma_display( 1 );                     // display buf1
 
         giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] display image %d at cycle %d\n", 
                         x, y, p, image, giet_proctime() );
-
         image++;
 
@@ -120 +111 @@
         {
             image = 0;
-            giet_fat_lseek( fd , 0 , 0 );
+            giet_fat_lseek( fd , 0 , SEEK_SET );
         }
 

soft/giet_vm/applications/display/display.py

@@ -22 +22 @@
     x = 0
     y = 0
-    p = 2
+    p = 0
 
     # define vsegs base & size