Changeset 14 for trunk/kernel/kern/printk.c

Timestamp:

May 3, 2017, 1:23:24 PM (7 years ago)

Author:

alain

Message:

Bugs fix.

File:

• trunk/kernel/kern/printk.c (modified) (3 diffs)

trunk/kernel/kern/printk.c

@@ -28 +28 @@
 #include <remote_spinlock.h>
 #include <cluster.h>
+#include <chdev.h>
 #include <printk.h>
+
+///////////////////////////////////////////////////////////////////////////////////
+//      Extern variables
+///////////////////////////////////////////////////////////////////////////////////
+
+extern chdev_t            txt0_chdev;        // allocated in kernel_init.c
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -213 +220 @@
 }  // end kernel_printf()
 
-////////////////////////////////
-void printk( char * format, ...)
+/////////////////////////////////
+void printk( char * format , ...)
 {
     va_list       args;
-
-    // call kernel_printf
+    uint32_t      save_sr;
+
+    // get extended pointer on remote TXT0 chdev lock
+    xptr_t  txt0_lock_xp = XPTR( LOCAL_CLUSTER->io_cxy , &txt0_chdev.wait_lock );
+
+    // get TXT0 lock in busy waiting mode
+    remote_spinlock_lock_busy( txt0_lock_xp , &save_sr );
+
+    // call kernel_printf in busy waiting mode
     va_start( args , format );
     kernel_printf( 0 , 1 , format , &args );
     va_end( args );
+
+    // release lock
+    remote_spinlock_unlock_busy( txt0_lock_xp , save_sr );
 }
 
-/////////////////////////////////////
-void user_printk( char* format, ...)
+//////////////////////////////////////
+void user_printk( char * format , ...)
 {
     va_list   args;
@@ -232 +249 @@
     uint32_t channel = 0;
 
-    // call kernel_printf
+   // call kernel_printf in descheduling mode
     va_start( args , format );
     kernel_printf( channel, 0 , format , &args );