Changeset 435 for trunk/kernel/devices

Timestamp:

Feb 20, 2018, 5:32:17 PM (7 years ago)

Author:

alain

Message:

Fix a bad bug in scheduler...

Location:

trunk/kernel/devices

Files:

• dev_txt.c (modified) (6 diffs)
• dev_txt.h (modified) (4 diffs)

trunk/kernel/devices/dev_txt.c

@@ -38 +38 @@
 extern chdev_directory_t  chdev_dir;         // allocated in kernel_init.c
 
-#if CONFIG_READ_DEBUG
+#if (CONFIG_DEBUG_SYS_READ & 1)
 extern uint32_t enter_txt_read;
 extern uint32_t exit_txt_read;
 #endif
+
+#if (CONFIG_DEBUG_SYS_WRITE & 1)
+extern uint32_t enter_txt_write;
+extern uint32_t exit_txt_write;
+#endif
+
+////////////////////////////////////////
+char * dev_txt_type_str( uint32_t type )
+{
+    if     ( type == TXT_SYNC_WRITE ) return "TXT_SYNC_WRITE";
+    else if( type == TXT_READ       ) return "TXT_READ";
+    else if( type == TXT_WRITE      ) return "TXT_WRITE";
+    else                              return "undefined"; 
+}
 
 //////////////////////////////////
@@ -117 +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();
@@ -151 +173 @@
 #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;
@@ -160 +190 @@
                        uint32_t   count )
 {
-    error_t error = dev_txt_access( TXT_WRITE , channel , buffer , count );
-    return error;
+    return dev_txt_access( TXT_WRITE , channel , buffer , count );
 }
 
@@ -168 +197 @@
                       char     * buffer )
 {
-
-#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;
-
+    return dev_txt_access( TXT_READ , channel , buffer , 1 );
 }
 
@@ -201 +218 @@
 
     // build arguments structure
-    txt_aux_t  args;
+    txt_sync_args_t  args;
     args.dev_xp = dev_xp;
     args.buffer = buffer;

trunk/kernel/devices/dev_txt.h

@@ -82 +82 @@
     TXT_READ       = 0,
     TXT_WRITE      = 1,
+    TXT_SYNC_WRITE = 2,
 };
 
@@ -87 +88 @@
 {
     xptr_t      dev_xp;    /*! extended pointer on the relevant TXT device descriptor    */
-    uint32_t    type;      /*! TXT_READ / TXT_WRITE / TXT_SYNC_WRITE                     */
+    uint32_t    type;      /*! TXT_READ / TXT_WRITE                                      */
     xptr_t      buf_xp;    /*! extended pointer on characters array                      */
     uint32_t    count;     /*! number of characters in buffer (must be 1 if to_mem)      */
@@ -99 +100 @@
  *****************************************************************************************/
 
-typedef struct txt_aux_s
+typedef struct txt_sync_args_s
 {
-    xptr_t      dev_xp;    /*! extended pointer on the TXT0 device descriptor            */
+    xptr_t      dev_xp;    /*! extended pointer on the TXT0_TX device descriptor            */
     char      * buffer;    /*! local pointer on characters array                         */
     uint32_t    count;     /*! number of characters in buffer                            */
 }
-txt_aux_t;
+txt_sync_args_t;
+
+/******************************************************************************************
+ * This function returns a printable string for the comman type.
+ ******************************************************************************************
+ * @ type     : command type (TXT_READ / TXT_WRITE / TXT_SYNC_WRITE)
+ *****************************************************************************************/
+char * dev_txt_type_str( uint32_t type );
 
 /******************************************************************************************
@@ -157 +165 @@
  * As it is used for debug, the command arguments <buffer> and <count> are registerd
  * in a specific "dbg_cmd" field of the calling thread.
- * other TXT accesses. 
  ****************************************************************************************
  * @ buffer    : local pointer on source buffer containing the string.