Changeset 657 for trunk/user/display/display.c

Timestamp:

Mar 18, 2020, 11:16:59 PM (4 years ago)

Author:

alain

Message:

Introduce remote_buf.c/.h & socket.c/.h files.
Update dev_nic.c/.h files.

File:

• trunk/user/display/display.c (modified) (4 diffs)

trunk/user/display/display.c

@@ -15 +15 @@
 #include <almosmkh.h>
 
-#define FILENAME    "misc/images_128.raw"
+#define PATH_MAX_LENGHT    128
+
 #define FBF_TYPE    420         
 #define NPIXELS     128
@@ -56 +57 @@
     }
 }        
+
 ////////////////
 int main( void )
@@ -64 +66 @@
     unsigned int    fbf_type;
     unsigned int    nbytes;
-    unsigned int    image = 0;
     int             val;
     int             error;
-
-    unsigned long long start_cycle;
-
-    // get  start cycle
-    get_cycle( &start_cycle );
-
-    printf("\n[display] starts at cycle %d\n", (unsigned int)start_cycle );
+    char            pathname[PATH_MAX_LENGHT];
 
     // check frame buffer size
@@ -92 +87 @@
     }
 
+    // get pathname for input file 
+    while( 1 )
+    {
+        printf("\n[display] path = ");
+
+        error = get_string( pathname , PATH_MAX_LENGHT );
+
+        if ( error )  printf("\n[display error] cannot get path for input file\n" );
+        else  break;
+    }
+
     // open file
+    int fd = open( pathname , O_RDONLY , 0 );
 
-    FILE * f = fopen( FILENAME , NULL );
-//  int fd = open( FILENAME, O_RDONLY , 0 );
-
-    if( f == NULL )
+    if( fd < 0 )
     {
-        printf("\n[display error] Cannot open file <%s>\n", FILENAME );
+        printf("\n[display error] Cannot open file <%s>\n", pathname );
         exit( 0 );
     }
 
-    printf("\n[display] open file <%s>\n", FILENAME );
+    printf("\n[display] open file <%s>\n", pathname );
 
-    // loop on images
-    while ( 1 )
+    // load buffer from file
+    nbytes = read( fd , buffer , NPIXELS * NLINES );
+
+    if( nbytes != NPIXELS * NLINES )
     {
-        // load image from file
-        nbytes = fread( buffer , 1 , NPIXELS * NLINES , f );
-//      nbytes = read( fd , buffer , NPIXELS * NLINES );
-        if( nbytes != NPIXELS * NLINES )
-        {
-            printf("\n[display error] Cannot load image %d\n", image );
-            exit( 0 );
-        }
-
-        printf("\n[display] load image %d in buffer %x\n", image, buffer );
- 
-        // display image
-        error = fbf_write( buffer , NPIXELS * NLINES , 0 );
-
-        if( error )
-        {
-            printf("\n[display error] Cannot access frame buffer\n");
-            exit( 0 );
-        }
-
-        printf("\n[display] display image %d\n", image );
-
-        image++;
-
-        // interactive behaviour
-        val = getchar();
+        printf("\n[display error] Cannot load image \n" );
+        exit( 0 );
     }
 
+    printf("\n[display] load image in buffer %x\n", buffer );
+ 
+    // display image
+    error = fbf_write( buffer , NPIXELS * NLINES , 0 );
+
+    if( error )
+    {
+        printf("\n[display error] Cannot access frame buffer\n");
+        exit( 0 );
+    }
+
+    printf("\n[display] display image\n");
+
     // close file
-   fclose( f );
-// close( fd );
+    close( fd );
    
     exit(0);