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

Timestamp:

Feb 12, 2019, 1:15:47 PM (5 years ago)

Author:

alain

Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.

File:

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

trunk/kernel/devices/dev_txt.c

@@ -53 +53 @@
 const char * dev_txt_type_str( dev_txt_cmd_t type )
 {
-  switch (type) {
-    case (TXT_SYNC_WRITE): return "TXT_SYNC_WRITE";
-    case (TXT_READ):       return "TXT_READ";
-    case (TXT_WRITE):      return "TXT_WRITE";
-    default:               return "undefined";
-  }
+    switch (type)
+    {
+        case (TXT_SYNC_WRITE): return "TXT_SYNC_WRITE";
+        case (TXT_READ):       return "TXT_READ";
+        case (TXT_WRITE):      return "TXT_WRITE";
+        default:               return "undefined";
+    }
 }
 
@@ -115 +116 @@
         error = thread_kernel_create( &new_thread,
                                       THREAD_DEV,
-                                      &chdev_sequencial_server,
+                                      &chdev_server_func,
                                       txt,
                                       lid );
@@ -178 +179 @@
 
 #if DEBUG_DEV_TXT_TX
-uint32_t cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
+uint32_t   cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_TXT_TX < cycle )
-printk("\n[DBG] %s : thread %x enters / cycle %d\n", __FUNCTION__, CURRENT_THREAD, cycle );
+printk("\n[%s] thread[%x,%x] enters / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, cycle );
 #endif
 
@@ -194 +197 @@
 
     // If we use MTTYs (vci_multi_tty), we perform only sync writes
+    // Otherwise, we use vci_tty_tsar so we can use async writes
+
     if( dev_ptr->impl == IMPL_TXT_MTY )
     {
@@ -212 +217 @@
     }
 
-    // Otherwise, we use vci_tty_tsar so we can use async writes
     else
     {
-    return dev_txt_access( TXT_WRITE , channel , buffer , count );
+        return dev_txt_access( TXT_WRITE , channel , buffer , count );
     }
 
@@ -221 +225 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_TXT_TX < cycle )
-printk("\n[DBG] %s : thread %x exit / cycle %d\n", __FUNCTION__, CURRENT_THREAD, cycle );
+printk("\n[%s] thread[%x,%x] exit / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, cycle );
 #endif
 
@@ -240 +245 @@
 
 #if DEBUG_DEV_TXT_RX
-uint32_t cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
+uint32_t   cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_TXT_RX < cycle )
-printk("\n[DBG] %s : thread %x enters / cycle %d\n", __FUNCTION__, CURRENT_THREAD, cycle );
+printk("\n[%s] thread[%x,%x] enters / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, cycle );
 #endif
 
@@ -250 +257 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_TXT_RX < cycle )
-printk("\n[DBG] %s : thread %x exit / cycle %d\n", __FUNCTION__, CURRENT_THREAD, cycle );
+printk("\n[%s] thread[%x,%x] exit / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, cycle );
 #endif