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

Timestamp:

Nov 7, 2017, 3:08:12 PM (6 years ago)

Author:

alain

Message:

First implementation of fork/exec.

File:

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

trunk/kernel/devices/dev_txt.c

@@ -27 +27 @@
 #include <hal_drivers.h>
 #include <thread.h>
+#include <chdev.h>
 #include <rpc.h>
 #include <printk.h>
@@ -36 +37 @@
 
 extern chdev_directory_t  chdev_dir;         // allocated in kernel_init.c
+
+#if CONFIG_READ_DEBUG
+extern uint32_t enter_txt_read;
+extern uint32_t exit_txt_read;
+#endif
 
 //////////////////////////////////
@@ -47 +53 @@
     uint32_t  channel = txt->channel;
     uint32_t  impl    = txt->impl;
+    bool_t    is_rx   = txt->is_rx;
 
     assert( (pic_xp != XPTR_NULL) || (channel == 0) , __FUNCTION__ , 
@@ -52 +59 @@
 
     // set chdev name
-    snprintf( txt->name , 16 , "txt_%d" , channel );
+    if( is_rx ) snprintf( txt->name , 16 , "txt%d_rx" , channel );
+    else        snprintf( txt->name , 16 , "txt%d_tx" , channel );
 
     // call driver init function
@@ -61 +69 @@
     if( channel != 0 && impl != IMPL_TXT_RS2 )
     {
-        // select a core to execute the TXT server thread
+        // select a core to execute the server thread
         lid_t lid = cluster_select_local_core();
 
-        // bind TXT IRQ to the selected core
+        // bind IRQ to the selected core
         dev_pic_bind_irq( lid , txt );
 
-        // enable TXT IRQ
+        // enable IRQ
         dev_pic_enable_irq( lid , XPTR( local_cxy , txt ) );
 
@@ -99 +107 @@
                                uint32_t   count )
 {
+    xptr_t     dev_xp;
     thread_t * this = CURRENT_THREAD;
 
-    txt_dmsg("\n[DMSG] in %s : thread %x in process %x enters\n",
-                 __FUNCTION__ , this->trdid , this->process->pid );
+txt_dmsg("\n[DBG] %s : core[%x,%d] (thread %s) enters / cycle %d\n",
+__FUNCTION__, local_cxy, this->core->lid, thread_type_str(this->type), hal_time_stamp() );
 
     // check channel argument
@@ -108 +117 @@
 
     // get extended pointer on remote TXT chdev descriptor
-    xptr_t  dev_xp = chdev_dir.txt[channel];
+    if( type == TXT_WRITE )  dev_xp = chdev_dir.txt_tx[channel];
+    else                     dev_xp = chdev_dir.txt_rx[channel];
 
     assert( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined TXT chdev descriptor" );
@@ -121 +131 @@
     // block client thread on THREAD_BLOCKED_IO and deschedule.
     // it is re-activated by the ISR signaling IO operation completion.
-    chdev_register_command( dev_xp , this );
+    chdev_register_command( dev_xp );
 
-    txt_dmsg("\n[DMSG] in %s : thread %x in process %x completes / error = %d\n",
-             __FUNCTION__ , this->trdid , this->process->pid , this->txt_cmd.error );
+txt_dmsg("\n[DBG] %s : core[%x,%d] (thread %s) exit / cycle %d\n",
+__FUNCTION__, local_cxy, this->core->lid, thread_type_str(this->type), hal_time_stamp() );
 
     // return I/O operation status from calling thread descriptor
@@ -135 +145 @@
                        uint32_t   count )
 {
-    return dev_txt_access( TXT_WRITE , channel , buffer , count );
+    error_t error = dev_txt_access( TXT_WRITE , channel , buffer , count );
+    return error;
 }
 
@@ -142 +153 @@
                       char     * buffer )
 {
-    return dev_txt_access( TXT_READ , channel , buffer , 1 );
+
+#if CONFIG_READ_DEBUG
+enter_txt_read = hal_time_stamp();
+#endif
+
+    error_t error = dev_txt_access( TXT_READ , channel , buffer , 1 );
+
+#if CONFIG_READ_DEBUG
+exit_txt_read = hal_time_stamp();
+#endif
+
+    return error;
+
 }
 
-///////////////////////////////////////////////
-error_t dev_txt_sync_write( uint32_t   channel,
-                            char     * buffer,
+//////////////////////////////////////////////
+error_t dev_txt_sync_write( char     * buffer,
                             uint32_t   count )
 {
-    // get pointer on calling thread
-    thread_t * this = CURRENT_THREAD;
+    // get extended pointer on TXT[0] chdev
+    xptr_t  dev_xp = chdev_dir.txt_tx[0];
 
-    // get extended pointer on TXT[0] chdev
-    xptr_t  dev_xp = chdev_dir.txt[channel];
+    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ ,
+    "undefined TXT0 chdev descriptor" );
 
-    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined TXT0 chdev descriptor" );
-
-    // register command in calling thread descriptor
-    this->txt_cmd.dev_xp  = dev_xp;
-    this->txt_cmd.type    = TXT_SYNC_WRITE;
-    this->txt_cmd.buf_xp  = XPTR( local_cxy , buffer );
-    this->txt_cmd.count   = count;
+    // get TXTO chdev cluster and local pointer
+    cxy_t    dev_cxy  = GET_CXY( dev_xp );
+    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
     // get driver command function
-    cxy_t       dev_cxy = GET_CXY( dev_xp );
-    chdev_t   * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
-    dev_cmd_t * cmd = (dev_cmd_t *)hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->cmd ) );
+    dev_aux_t * aux = (dev_aux_t *)hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->aux ) );
+
+    // build arguments structure
+    txt_aux_t  args;
+    args.dev_xp = dev_xp;
+    args.buffer = buffer;
+    args.count  = count;
 
     // call driver function
-    cmd( XPTR( local_cxy , this ) );
+    aux( &args );
 
-    // return I/O operation status from calling thread descriptor
-    return this->txt_cmd.error;
+    return 0;
 }