Changeset 297 for soft/giet_vm/display

Timestamp:

Mar 28, 2014, 10:48:51 AM (11 years ago)

Author:

alain

Message:

Bug fix in both _tty_rx_isr() and _bdv_isr():
The ISR must do nothing it the status indicates that
there is no pending ISR.

Location:

soft/giet_vm/display

Files:

• main.c (modified) (2 diffs)
• main_cma.c (modified) (6 diffs)

soft/giet_vm/display/main.c

@@ -24 +24 @@
     ///////////////////////////////////////////
     fd = giet_fat_open( "misc/images.raw", 0 );
-    if ( fd < 0 )
-    {
-        giet_tty_printf("\n*** echec giet_fat_open for misc/images.raw at cycle %d\n", 
-                        giet_proctime() );
-        giet_exit();
-    }
-    else
-    {
-        giet_tty_printf("\ngiet_fat_open completed for misc/images.raw at cycle %d\n", 
-                        giet_proctime() );
-    }
+    if ( fd < 0 ) giet_exit("echec giet_fat_open for misc/images.raw");
+
+    giet_tty_printf("\ngiet_fat_open completed for misc/images.raw at cycle %d\n", 
+                    giet_proctime() );
 
     /////////////////////////////////////////
@@ -40 +33 @@
     {
         // lecture image sur le disque
-        blocks = giet_fat_read( fd, buf, NBLOCKS, blocks_to_skip );
-        if ( blocks != NBLOCKS )
-        {
-            giet_tty_printf("\n*** echec giet_fat_read at cycle %d\n", 
-                            giet_proctime() );
-            giet_exit();
-        }
-        else
-        {
-            giet_tty_printf("\ngiet_fat_read for image %d completed at cycle %d \n", 
-                            (blocks_to_skip>>5), giet_proctime());
-        }
+        giet_fat_read( fd, buf, NBLOCKS, blocks_to_skip );
+        
+        giet_tty_printf("\ngiet_fat_read for image %d completed at cycle %d \n", 
+                        (blocks_to_skip>>5), giet_proctime());
 
         // transfert vers le frame buffer  
-        ko = giet_fb_sync_write( 0, buf, 128 * 128 );
-        if ( ko )
-        {
-            giet_tty_printf("\n*** echec giet_fb_sync_write at cycle %d\n", 
-                            giet_proctime() );
-            giet_exit();
-        }
-        else
-        {
-            giet_tty_printf("\ndisplay completed for image %d at cycle %d \n", 
-                            (blocks_to_skip>>5), giet_proctime());
-        }
+        giet_fb_sync_write( 0, buf, 128 * 128 );
+
+        giet_tty_printf("\ndisplay completed for image %d at cycle %d \n", 
+                        (blocks_to_skip>>5), giet_proctime());
 
         blocks_to_skip = blocks_to_skip + NBLOCKS;
     }
 
-    giet_tty_printf("\n*** Tak display exit at cycle %d ***\n", giet_proctime());
-    giet_exit();
+    giet_exit("completed");
 }

soft/giet_vm/display/main_cma.c

@@ -20 +20 @@
                       x, y, lpid, giet_proctime() );
 
-    //////////////////////////////////////////
     fd = giet_fat_open( "misc/images.raw", 0 );
-    if ( fd < 0 )
-    {
-        giet_tty_printf("\n*** echec giet_fat_open for misc/images.raw at cycle %d\n", 
-                        giet_proctime() );
-        giet_exit();
-    }
-    else
-    {
-        giet_tty_printf("\ngiet_fat_open completed for misc/images.raw at cycle %d\n", 
-                        giet_proctime() );
-    }
+    if ( fd < 0 ) giet_exit("echec giet_fat_open for misc/images.raw");
 
-    ////////////////////////////////////////
+    giet_tty_printf("\ngiet_fat_open completed for misc/images.raw at cycle %d\n", 
+                    giet_proctime() );
+
     giet_fb_cma_init( buf0, buf1, 128*128 );
 
@@ -42 +33 @@
     while ( blocks_to_skip < 10 * NBLOCKS )
     {
-        ///////////////////////////////////////////////////
         giet_fat_read( fd, buf0, NBLOCKS, blocks_to_skip );
 
@@ -48 +38 @@
                             giet_proctime() );
 
-        ///////////////////////
         giet_fb_cma_write( 0 );
 
@@ -56 +45 @@
         blocks_to_skip = blocks_to_skip + NBLOCKS;
 
-        ///////////////////////////////////////////////////
         giet_fat_read( fd, buf1, NBLOCKS, blocks_to_skip );
 
@@ -62 +50 @@
                             giet_proctime() );
 
-        ///////////////////////
         giet_fb_cma_write( 1 );
         
@@ -71 +58 @@
     }
 
-    ///////////////////
     giet_fb_cma_stop();
 
-    giet_tty_printf("\n*** Task display exit at cycle %d ***\n", giet_proctime());
-
-    giet_exit();
+    giet_exit("display completed");
 }