Changeset 619 for trunk/hal/tsar_mips32/drivers

Timestamp:

Feb 12, 2019, 1:15:47 PM (6 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/hal/tsar_mips32/drivers/soclib_tty.c (modified) (8 diffs)

trunk/hal/tsar_mips32/drivers/soclib_tty.c

@@ -131 +131 @@
 #endif
 
+#if( DEBUG_HAL_TXT_TX || DEBUG_HAL_TXT_RX )
+thread_t * this = CURRENT_THREAD;
+#endif
+
     // get TXT device cluster and pointers
     xptr_t     dev_xp = (xptr_t)hal_remote_l64( XPTR( th_cxy , &th_ptr->txt_cmd.dev_xp ) );
@@ -160 +164 @@
 
 #if DEBUG_HAL_TXT_TX
-uint32_t tx_cycle = (uint32_t)hal_get_cycles();
+uint32_t   tx_cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_HAL_TXT_TX < tx_cycle )
-printk("\n[DBG] %s : thread %x put character <%c> to TXT%d_TX fifo / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, byte, channel, tx_cycle );
+printk("\n[%s] thread[%x,%x] put character <%c> to TXT%d_TX fifo / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, byte, channel, tx_cycle );
 #endif
                 // write byte to FIFO
@@ -195 +199 @@
     }
     ///////////////////////////
-    else if( type == TXT_READ )       // read bytes from TTY_RX FIFO   
+    else if( type == TXT_READ )       // read several bytes from TTY_RX FIFO   
     {
         fifo = &tty_rx_fifo[channel];
@@ -211 +215 @@
 uint32_t rx_cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_HAL_TXT_RX < rx_cycle )
-printk("\n[DBG] %s : thread %x get character <%c> from TXT%d_RX fifo / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, byte, channel, rx_cycle );
+printk("\n[%s] thread[%x,%x] get character <%c> from TXT%d_RX fifo / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, byte, channel, rx_cycle );
 #endif
                 // update FIFO state
@@ -328 +332 @@
 #if DEBUG_HAL_TXT_RX
 if( DEBUG_HAL_TXT_RX < rx_cycle )
-printk("\n[DBG] %s : read ^Z character from TXT%d\n", __FUNCTION__, channel );
+printk("\n[%s] read ^Z character from TXT%d\n", __FUNCTION__, channel );
 #endif
                 // get pointers on TXT owner process in owner cluster
@@ -381 +385 @@
 #if DEBUG_HAL_TXT_RX
 if( DEBUG_HAL_TXT_RX < rx_cycle )
-printk("\n[DBG] %s : read ^C character from TXT%d\n", __FUNCTION__, channel );
+printk("\n[%s] read ^C character from TXT%d\n", __FUNCTION__, channel );
 #endif
                 // get pointer on TXT owner process in owner cluster
@@ -434 +438 @@
 #if DEBUG_HAL_TXT_RX
 if( DEBUG_HAL_TXT_RX < rx_cycle )
-printk("\n[DBG] %s : put character <%c> to TXT%d_RX fifo\n",
+printk("\n[%s] put character <%c> to TXT%d_RX fifo\n",
 __FUNCTION__, byte, channel );
 #endif
@@ -481 +485 @@
 #if DEBUG_HAL_TXT_TX
 if( DEBUG_HAL_TXT_TX < tx_cycle )
-printk("\n[DBG] %s : get character <%c> from TXT%d_TX fifo\n",
+printk("\n[%s] get character <%c> from TXT%d_TX fifo\n",
 __FUNCTION__, byte, channel );
 #endif