Changeset 674 for trunk/kernel/devices/dev_txt.c

Timestamp:

Nov 20, 2020, 12:04:01 AM (4 years ago)

Author:

alain

Message:

1) Introduce up to 4 command lines arguments in the KSH "load" command.
These arguments are transfered to the user process through the
argc/argv mechanism, using the user space "args" vseg.

2) Introduce the named and anonymous "pipes", for inter-process communication
through the pipe() and mkfifo() syscalls.

3) Introduce the "chat" application to validate the two above mechanisms.

4) Improve printk() and assert() fonctions in printk.c.

File:

• trunk/kernel/devices/dev_txt.c (modified) (7 diffs)

trunk/kernel/devices/dev_txt.c

@@ -74 +74 @@
     bool_t    is_rx   = txt->is_rx;
 
-assert( (pic_xp != XPTR_NULL) || (channel == 0) ,
+assert( __FUNCTION__, ((pic_xp != XPTR_NULL) || (channel == 0)) ,
 "PIC not initialised before TXT" );
 
     // set chdev name
-    if( is_rx ) snprintf( txt->name , 16 , "txt%d_rx" , channel );
-    else        snprintf( txt->name , 16 , "txt%d_tx" , channel );
+    if( is_rx ) snprintk( txt->name , 16 , "txt%d_rx" , channel );
+    else        snprintk( txt->name , 16 , "txt%d_tx" , channel );
 
     // set TXT chdev extension
@@ -120 +120 @@
                                       lid );
 
-        assert( (error == 0) , "cannot create server thread" );
+        assert( __FUNCTION__, (error == 0) , "cannot create server thread" );
 
         // set "server" field in chdev descriptor
@@ -154 +154 @@
 
 // check channel argument
-assert( (channel < CONFIG_MAX_TXT_CHANNELS) , "illegal channel index" );
+assert( __FUNCTION__, (channel < CONFIG_MAX_TXT_CHANNELS) , "illegal channel index" );
 
     // get pointers on chdev
@@ -162 +162 @@
 
 // check dev_xp 
-assert( (dev_xp != XPTR_NULL) , "undefined TXT chdev descriptor" );
+assert( __FUNCTION__, (dev_xp != XPTR_NULL) , "undefined TXT chdev descriptor" );
 
     // If we use MTTY (vci_multi_tty), we do a synchronous write on TXT[0]
@@ -243 +243 @@
 
 // check channel argument
-assert( (channel < CONFIG_MAX_TXT_CHANNELS) , "illegal channel index" );
+assert( __FUNCTION__, (channel < CONFIG_MAX_TXT_CHANNELS) , "illegal channel index" );
 
     // get pointers on chdev
@@ -249 +249 @@
 
 // check dev_xp 
-assert( (dev_xp != XPTR_NULL) , "undefined TXT chdev descriptor" );
+assert( __FUNCTION__, (dev_xp != XPTR_NULL) , "undefined TXT chdev descriptor" );
 
     // register command in calling thread descriptor
@@ -290 +290 @@
                             uint32_t     count )
 {
-    // get extended pointer on TXT[0] chdev
-    xptr_t  dev_xp = chdev_dir.txt_tx[0];
-
-    assert( (dev_xp != XPTR_NULL) ,
-    "undefined TXT0 chdev descriptor" );
-
-    // get TXTO chdev cluster and local pointer
-    cxy_t    dev_cxy  = GET_CXY( dev_xp );
+    // get extended pointers on TXT[0] chdev
+    xptr_t    dev_xp  = chdev_dir.txt_tx[0];
+    cxy_t     dev_cxy = GET_CXY( dev_xp );
     chdev_t * dev_ptr = GET_PTR( dev_xp );
 
-    // get driver command function
-    dev_aux_t * aux = (dev_aux_t *)hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->aux ) );
-
-    // build arguments structure
-    txt_sync_args_t  args;
-    args.dev_xp = dev_xp;
-    args.buffer = buffer;
-    args.count  = count;
-    args.channel = 0;
-
-    // call driver function
-    aux( &args );
-
-    return 0;
-}
-
+    if( dev_xp != XPTR_NULL) 
+    {
+        // get driver command function
+        dev_aux_t * aux = (dev_aux_t *)hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->aux ) );
+
+        // build arguments structure
+        txt_sync_args_t  args;
+        args.dev_xp = dev_xp;
+        args.buffer = buffer;
+        args.count  = count;
+        args.channel = 0;
+
+        // call driver function
+        aux( &args );
+
+        return 0;
+    }
+    else
+    {
+        return -1;
+    }
+}   // end dev_txt_sync_write() 
+