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

Timestamp:

Jul 12, 2017, 8:12:41 PM (7 years ago)

Author:

alain

Message:

Redefine the PIC device API.

File:

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

trunk/kernel/kern/printk.c

@@ -35 +35 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
-extern chdev_t            txt0_chdev;        // allocated in kernel_init.c
+extern chdev_directory_t  chdev_dir;  // defined in chdev.h / allocated in kernel_init.c
 
 /////////////////////////////////////
@@ -369 +369 @@
     uint32_t      save_sr;
 
+    // get pointers on TXT0 chdev
+    xptr_t    txt0_xp  = chdev_dir.txt[0];
+    cxy_t     txt0_cxy = GET_CXY( txt0_xp );
+    chdev_t * txt0_ptr = GET_PTR( txt0_xp );
+
     // get extended pointer on remote TXT0 chdev lock
-    xptr_t  txt0_lock_xp = XPTR( LOCAL_CLUSTER->io_cxy , &txt0_chdev.wait_lock );
+    xptr_t  lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
 
     // get TXT0 lock in busy waiting mode
-    remote_spinlock_lock_busy( txt0_lock_xp , &save_sr );
+    remote_spinlock_lock_busy( lock_xp , &save_sr );
 
     // call kernel_printf on TXT0, in busy waiting mode
@@ -381 +386 @@
 
     // release lock
-    remote_spinlock_unlock_busy( txt0_lock_xp , save_sr );
+    remote_spinlock_unlock_busy( lock_xp , save_sr );
 }
 
@@ -406 +411 @@
     }
 }
+
+//////////////////////////////////////////////////
+inline void nolock_assert( bool_t       condition,
+                           const char * function_name,
+                           char       * string )
+{
+    if( condition == false )
+    {
+        nolock_printk("\n[PANIC] in %s : %s\n" , function_name , string );
+        hal_core_sleep();
+    }
+}
+