Changeset 643 for trunk/libs

Timestamp:

Oct 17, 2019, 3:14:01 PM (5 years ago)

Author:

alain

Message:

Introduce FBF related syscalls.

Location:

trunk/libs

Files:

• libalmosmkh/almosmkh.c (modified) (2 diffs)
• libalmosmkh/almosmkh.h (modified) (3 diffs)
• mini-libc/stdio.c (modified) (1 diff)
• mini-libc/stdio.h (modified) (1 diff)
• mini-libc/stdlib.h (modified) (1 diff)

trunk/libs/libalmosmkh/almosmkh.c

@@ -26 +26 @@
 #include <hal_macros.h>
 #include <hal_shared_types.h>
+#include <shared_fbf.h>
 #include <syscalls_numbers.h>
 #include <string.h>
@@ -1451 +1452 @@
 }  // end pthread_parallel_create()
 
+/////////////////////////////////////////////////////////////////////////////////////////
+///////////////    non standard Frame Buffer related syscalls
+/////////////////////////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////
+int fbf_get_config( int * width,
+                    int * height,
+                    int * type )
+{
+    return hal_user_syscall( SYS_FBF,
+                             FBF_GET_CONFIG, 
+                             (reg_t)width,
+                             (reg_t)height,                           
+                             (reg_t)type );                           
+}
+
+////////////////////////////
+int fbf_read( void * buffer,
+              int    length,
+              int    offset )
+{
+    return hal_user_syscall( SYS_FBF,
+                             FBF_READ,
+                             (reg_t)buffer,
+                             (reg_t)length,                           
+                             (reg_t)offset );                         
+}
+
+////////////////////////////
+int fbf_write( void * buffer,
+               int    length,
+               int    offset )
+{
+    return hal_user_syscall( SYS_FBF,
+                             FBF_WRITE,
+                             (reg_t)buffer,
+                             (reg_t)length,                           
+                             (reg_t)offset );    
+}
 
 

trunk/libs/libalmosmkh/almosmkh.h

@@ -380 +380 @@
 #define MALLOC_INITIALIZED         0xBABEF00D   // magic number when initialised
 #define MALLOC_MIN_BLOCK_SIZE      0x40         // 64 bytes
-#define MALLOC_LOCAL_STORE_SIZE    0x800000     // 8 Mbytes     
+#define MALLOC_LOCAL_STORE_SIZE    0x2000000    // 32 Mbytes     
 #define MALLOC_MAX_CLUSTERS        0x100        // 256 clusters
 
@@ -496 +496 @@
 /*****************************************************************************************
  * This blocking function creates N working threads that execute the code defined
- * by the <work_func> and <work_args> arguments.
+ * by the <work_func> and <work_args> arguments, and returns only when all working
+ * threads completed.
  * The number N of created threads is entirely defined by the <root_level> argument.
  * This value defines an abstract quad-tree, with a square base : level in [0,1,2,3,4],
@@ -521 +522 @@
                              void         * parent_barriers_array );
 
+/********* Non standard (ALMOS-MKH specific) Frame Buffer access syscalls   *************/
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// The following system calls can be used to access the SoCLib Frame Buffer, that
+// is a very simple graphic controller, that is seen by the software as a single
+// buffer of <height> lines of <width> pixels. 
+//////////////////////////////////////////////////////////////////////////////////////////
+
+/*****************************************************************************************
+ * This function returns in the <width> and <height> arguments the buffer size.
+ *****************************************************************************************
+ * @ width   : [out] number of pixels per line.
+ * @ height  : [out] number of lines.
+ * @ type    : [out] pixel encoding type.
+ * @ returns 0 if success / returns -1 if error.
+ ****************************************************************************************/
+int fbf_get_config( int * width,
+                    int * height,
+                    int * type );
+
+/*****************************************************************************************
+ * This blocking function moves <length> bytes from the frame buffer, starting 
+ * from <offset>, to the user buffer defined by <buffer> argument.
+ *****************************************************************************************
+ * @ buffer  : pointer on buffer in user space.
+ * @ length  : number of pixels (one byte per pixel).
+ * @ offset  : first pixel index in frame buffer.
+ * @ returns 0 if success / returns -1 if error.
+ ****************************************************************************************/
+int fbf_read( void * buffer,
+              int    length,
+              int    offset );
+
+/*****************************************************************************************
+ * This blocking function moves <length> bytes from the user buffer defined by <buffer>
+ * argument to the frame buffer, starting at <offset> in frame buffer.
+ *****************************************************************************************
+ * @ buffer  : pointer on buffer in user space.
+ * @ length  : number of pixels (one byte per pixel).
+ * @ offset  : first pixel index in frame buffer.
+ * @ returns 0 if success / returns -1 if error.
+ ****************************************************************************************/
+int fbf_write( void * buffer,
+               int    length,
+               int    offset );
+
 #endif /* _LIBALMOSMKH_H_ */
 

trunk/libs/mini-libc/stdio.c

@@ -399 +399 @@
 }  // end fclose()
 
+//////////////////////////////////////////
+unsigned int fread( void         * buffer,
+                    unsigned int   size,
+                    unsigned int   nitems,
+                    FILE         * stream )
+{
+    // check stream valid
+    if( stream->key != VALID_OPEN_FILE ) return EOF;
+
+    // get file descriptor from stream pointer
+    int fd = stream->fd;
+
+    // compute nbytes
+    unsigned int nbytes = size * nitems;
+
+    if( hal_user_syscall( SYS_READ,
+                          (reg_t)fd,
+                          (reg_t)buffer,
+                          (reg_t)nbytes, 0 ) == nbytes ) return nitems;
+    else return 0;
+
+}  // end fread() 
+
+//////////////////////////////////////////
+unsigned int fwrite( void         * buffer,
+                     unsigned int   size,
+                     unsigned int   nitems,
+                     FILE         * stream )
+{
+    // check stream valid
+    if( stream->key != VALID_OPEN_FILE ) return EOF;
+
+    // get file descriptor from stream pointer
+    int fd = stream->fd;
+
+    // compute nbytes
+    unsigned int nbytes = size * nitems;
+
+    if( hal_user_syscall( SYS_WRITE,
+                          (reg_t)fd,
+                          (reg_t)buffer,
+                          (reg_t)nbytes, 0 ) == nbytes ) return nitems;
+    else return 0;
+
+}  // end fwrite() 
+
 /////////////////////////////////
 int fprintf( FILE       * stream,

trunk/libs/mini-libc/stdio.h

@@ -141 +141 @@
              const char * format, ... );
 
+/*********************************************************************************************
+ * This function moves <nitems> oblects, each <size> bytes long, from an input stream
+ * identified by <stream>, to the user buffer identified by the <buffer> argument.
+ * It can be a regular file or a character oriented input device.
+ *********************************************************************************************
+ * @ stream    : pointer on a stream.
+ * @ format    : formated string.
+ * @ returns actual number of items read if success / returns 0 if failure.
+ ********************************************************************************************/
+unsigned int fread( void         * buffer,
+                    unsigned int   size,
+                    unsigned int   nitems,
+                    FILE         * stream );  
+
+/*********************************************************************************************
+ * This function moves <nitems> oblects, each <size> bytes long, from an user buffer
+ * identified by the <buffer> argument, to an output stream identified by <stream>.
+ * It can be a  regular file or a character oriented input device.
+ *********************************************************************************************
+ * @ stream    : pointer on a stream.
+ * @ format    : formated string.
+ * @ returns actual number of written items if success / returns 0 if failure.
+ ********************************************************************************************/
+unsigned int fwrite( void         * buffer,
+                     unsigned int   size,
+                     unsigned int   nitems,
+                     FILE         * stream );  
 
 #endif  // _STDIO_H_

trunk/libs/mini-libc/stdlib.h

@@ -39 +39 @@
  * This function terminates a process.
  *****************************************************************************************
- * @ status   : terminaison status : 0 / EXIT_SUCCESS / EXIT_FAILURE.
+ * @ status   : terminaison status : EXIT_SUCCESS / EXIT_FAILURE.
  ****************************************************************************************/
 void exit( int status );