Changeset 451 for trunk/hal/tsar_mips32/drivers/soclib_tty.c

Timestamp:

Jul 5, 2018, 3:45:43 PM (6 years ago)

Author:

alain

Message:

Fix a bug in soclib_pic driver (bad separation between IOPIC an LAPIC initialisation)

File:

• trunk/hal/tsar_mips32/drivers/soclib_tty.c (modified) (8 diffs)

trunk/hal/tsar_mips32/drivers/soclib_tty.c

@@ -2 +2 @@
  * soclib_tty.c - soclib tty driver implementation.
  *
- * Author  Alain Greiner (2016)
+ * Author  Alain Greiner (2016,2017,2018)
  *
  * Copyright (c)  UPMC Sorbonne Universites
@@ -22 +22 @@
  */
 
+
+#include <hal_kernel_types.h>
 #include <dev_txt.h>
 #include <chdev.h>
@@ -123 +125 @@
 #endif
 
-#if DEBUG_HAL_TXT_RX
-uint32_t rx_cycle = (uint32_t)hal_get_cycles();
-if( (DEBUG_HAL_TXT_RX < rx_cycle) && (type == TXT_READ) )
-printk("\n[DBG] %s : thread %x enter for RX / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , rx_cycle );
-#endif
-
-#if DEBUG_HAL_TXT_TX
-uint32_t tx_cycle = (uint32_t)hal_get_cycles();
-if( (DEBUG_HAL_TXT_TX < tx_cycle) && (type == TXT_WRITE) )
-printk("\n[DBG] %s : thread %x enter for TX / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , tx_cycle );
-#endif
-
     // get TXT device cluster and pointers
     xptr_t     dev_xp = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->txt_cmd.dev_xp ) );
@@ -165 +153 @@
                 byte = hal_remote_lb( buf_xp + done );
 
+#if DEBUG_HAL_TXT_TX
+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 );
+#endif
                 // write byte to FIFO
                 fifo->data[fifo->ptw] = byte;
@@ -208 +202 @@
                 char byte = fifo->data[fifo->ptr];
 
+#if DEBUG_HAL_TXT_RX
+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 );
+#endif
                 // update FIFO state
                 fifo->ptr = (fifo->ptr + 1) % TTY_FIFO_DEPTH;
@@ -235 +235 @@
         assert( false , __FUNCTION__ , "illegal TXT command\n" );
     }
-
-#if DEBUG_HAL_TXT_RX
-rx_cycle = (uint32_t)hal_get_cycles();
-if( (DEBUG_HAL_TXT_RX < rx_cycle) && (type == TXT_READ) )
-printk("\n[DBG] %s : thread %x exit after RX / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , rx_cycle );
-#endif
-
-#if DEBUG_HAL_TXT_TX
-tx_cycle = (uint32_t)hal_get_cycles();
-if( (DEBUG_HAL_TXT_TX < tx_cycle) && (type == TXT_WRITE) )
-printk("\n[DBG] %s : thread %x exit after TX / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , tx_cycle );
-#endif
 
 #if (DEBUG_SYS_READ & 1)
@@ -453 +439 @@
 #if DEBUG_HAL_TXT_RX
 if( DEBUG_HAL_TXT_RX < rx_cycle )
-printk("\n[DBG] %s : read character %c from TXT%d\n", __FUNCTION__, byte, channel );
+printk("\n[DBG] %s : put character <%c> to TXT%d_RX fifo\n",
+__FUNCTION__, byte, channel );
 #endif
                 // store byte into FIFO 
@@ -496 +483 @@
 #if DEBUG_HAL_TXT_TX
 if( DEBUG_HAL_TXT_TX < tx_cycle )
-printk("\n[DBG] %s : write character %c to TXT%d\n", __FUNCTION__, byte, channel );
+printk("\n[DBG] %s : get character <%c> from TXT%d_TX fifo\n",
+__FUNCTION__, byte, channel );
 #endif
                 // update TX_FIFO state