Changeset 436 for trunk/kernel/devices

Timestamp:

Mar 7, 2018, 9:02:03 AM (7 years ago)

Author:

alain

Message:

1) improve the threads and process destruction mechanism.
2) introduce FIFOs in the soclib_tty driver.

Location:

trunk/kernel/devices

Files:

• dev_nic.c (modified) (2 diffs)
• dev_txt.c (modified) (4 diffs)

trunk/kernel/devices/dev_nic.c

@@ -130 +130 @@
 
         // block on THREAD_BLOCKED_IO condition and deschedule
-        thread_block( thread_ptr , THREAD_BLOCKED_IO );
+        thread_block( XPTR( local_cxy , thread_ptr ) , THREAD_BLOCKED_IO );
         sched_yield("client blocked on I/O");
 
@@ -200 +200 @@
 
         // block on THREAD_BLOCKED I/O condition and deschedule
-        thread_block( thread_ptr , THREAD_BLOCKED_IO );
+        thread_block( XPTR( local_cxy , thread_ptr ) , THREAD_BLOCKED_IO );
         sched_yield("client blocked on I/O");
 

trunk/kernel/devices/dev_txt.c

@@ -131 +131 @@
     thread_t * this = CURRENT_THREAD;
 
-#if (CONFIG_DEBUG_SYS_READ & 1)
-enter_txt_read = hal_time_stamp();
-#endif
-
-#if (CONFIG_DEBUG_SYS_WRITE & 1)
-enter_txt_write = hal_time_stamp();
-#endif
-
-#if CONFIG_DEBUG_DEV_TXT
-uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_DEV_TXT < cycle )
-printk("\n[DBG] %s : thread %x enters / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD , cycle );
-#endif
-
     // check channel argument
     assert( (channel < CONFIG_MAX_TXT_CHANNELS) , __FUNCTION__ , "illegal channel index" );
@@ -166 +151 @@
     chdev_register_command( dev_xp );
 
-#if CONFIG_DEBUG_DEV_TXT
-cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_DEV_TXT < cycle )
-printk("\n[DBG] %s : thread %x exit / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD , cycle );
-#endif
-
-#if (CONFIG_DEBUG_SYS_READ & 1)
-exit_txt_read = hal_time_stamp();
-#endif
-
-#if (CONFIG_DEBUG_SYS_WRITE & 1)
-exit_txt_write = hal_time_stamp();
-#endif
-
     // return I/O operation status from calling thread descriptor
     return this->txt_cmd.error;
@@ -190 +160 @@
                        uint32_t   count )
 {
+
+#if (CONFIG_DEBUG_SYS_WRITE & 1)
+enter_txt_write = hal_time_stamp();
+#endif
+
+#if CONFIG_DEBUG_DEV_TXT_TX
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_DEV_TXT_TX < cycle )
+printk("\n[DBG] %s : thread %x enters / cycle %d\n", __FUNCTION__, CURRENT_THREAD, cycle );
+#endif
+
     return dev_txt_access( TXT_WRITE , channel , buffer , count );
+
+#if CONFIG_DEBUG_DEV_TXT_TX
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_DEV_TXT_TX < cycle )
+printk("\n[DBG] %s : thread %x exit / cycle %d\n", __FUNCTION__, CURRENT_THREAD, cycle );
+#endif
+
+#if (CONFIG_DEBUG_SYS_WRITE & 1)
+exit_txt_write = hal_time_stamp();
+#endif
+
 }
 
@@ -197 +189 @@
                       char     * buffer )
 {
+
+#if (CONFIG_DEBUG_SYS_READ & 1)
+enter_txt_read = hal_time_stamp();
+#endif
+
+#if CONFIG_DEBUG_DEV_TXT_RX
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_DEV_TXT_RX < cycle )
+printk("\n[DBG] %s : thread %x enters / cycle %d\n", __FUNCTION__, CURRENT_THREAD, cycle );
+#endif
+
     return dev_txt_access( TXT_READ , channel , buffer , 1 );
+
+#if CONFIG_DEBUG_DEV_TXT_RX
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_DEV_TXT_RX < cycle )
+printk("\n[DBG] %s : thread %x exit / cycle %d\n", __FUNCTION__, CURRENT_THREAD, cycle );
+#endif
+
+#if (CONFIG_DEBUG_SYS_READ & 1)
+exit_txt_read = hal_time_stamp();
+#endif
+
 }