Changeset 544 for soft

Timestamp:

Apr 4, 2015, 11:34:33 AM (9 years ago)

Author:

alain

Message:

Introducing interactivity in the display application to test
dynamic routing of the TTY_RX interrupt.

File:

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

soft/giet_vm/applications/display/main.c

@@ -15 +15 @@
 #define NPIXELS     128
 #define NLINES      128
-#define NIMAGES     10                    
+#define NIMAGES     20                  
 #define NBLOCKS     (NPIXELS*NLINES/512)   // number of blocks per image
 
+#define INTERACTIVE 1
 
 unsigned char buf0[NPIXELS*NLINES] __attribute__((aligned(512)));
@@ -35 +36 @@
     unsigned int    image = 0;
 
+    char            byte;
+
     // parameters checking
     if ( (NPIXELS != FBUF_X_SIZE) || (NLINES != FBUF_Y_SIZE) )
@@ -41 +44 @@
     }
 
-    giet_shr_printf("\n[DISPLAY] Processor[%d,%d,%d] starts at cycle %d\n",
+    // get a private TTY 
+    giet_tty_alloc();
+
+    giet_tty_printf("\n[DISPLAY] Processor[%d,%d,%d] starts at cycle %d\n",
                     x, y, lpid, giet_proctime() );
 
     // open file
     fd = giet_fat_open( FILENAME , 0 );
-    if ( fd < 0 ) 
-    {
-        giet_exit("echec giet_fat_open for misc/images.raw");
-    }
-    else
-    {
-        giet_shr_printf("\n[DISPLAY] Proc[%d,%d,%d] open file %s at cycle %d\n", 
+
+    giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] open file %s at cycle %d\n", 
                     x, y, lpid, FILENAME, giet_proctime() );
-    }
 
     // get a Chained Buffer DMA channel
@@ -62 +62 @@
     giet_fbf_cma_start( buf0, buf1, NPIXELS*NLINES );
     
-    giet_shr_printf("\n[DISPLAY] Proc[%d,%d,%d] starts CMA at cycle %d\n", 
+    giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] starts CMA at cycle %d\n", 
                     x, y, lpid, giet_proctime() );
 
     // Main loop (on images)
-    while ( image < NIMAGES )
+    while ( 1 )
     {
         // load buf0
         giet_fat_read( fd, buf0, NBLOCKS, image*NBLOCKS );
 
-        giet_shr_printf("\n[DISPLAY] Proc[%d,%d,%d] load image %d to buf0 at cycle %d\n", 
+        giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] load image %d at cycle %d\n", 
                         x, y, lpid, image, giet_proctime() );
 
@@ -77 +77 @@
         giet_fbf_cma_display( 0 );
 
-        giet_shr_printf("\n[DISPLAY] Proc[%d,%d,%d] display image %d from buf0 at cycle %d\n", 
+        giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] display image %d at cycle %d\n", 
                         x, y, lpid, image, giet_proctime() );
 
-        image++;
+        image = (image + 1) % NIMAGES;
+
+        if ( INTERACTIVE ) giet_tty_getc( &byte );
 
         // load buf1
         giet_fat_read( fd, buf1, NBLOCKS, image*NBLOCKS );
 
-        giet_shr_printf("\n[DISPLAY] Proc[%d,%d,%d] load image %d to buf1 at cycle %d\n", 
+        giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] load image %d at cycle %d\n", 
                         x, y, lpid, image, giet_proctime() );
 
@@ -91 +93 @@
         giet_fbf_cma_display( 1 );
 
-        giet_shr_printf("\n[DISPLAY] Proc[%d,%d,%d] display image %d from buf1 at cycle %d\n", 
+        giet_tty_printf("\n[DISPLAY] Proc[%d,%d,%d] display image %d at cycle %d\n", 
                         x, y, lpid, image, giet_proctime() );
 
-        image++;
+        image = (image + 1) % NIMAGES;
+
+        if ( INTERACTIVE ) giet_tty_getc( &byte );
     }