Changeset 492 for trunk/kernel/devices/dev_txt.c

Timestamp:

Aug 22, 2018, 11:55:48 PM (6 years ago)

Author:

viala@…

Message:

Refactoring assert calling to conform with new assert macro.

Made with this command for the general case.
find ./kernel/ hal/ -name "*.c" | xargs sed -i -e '/assert(/ s/,[ ]*FUNCTION[ ]*,/,/'

And some done by hand.

File:

• trunk/kernel/devices/dev_txt.c (modified) (5 diffs)

trunk/kernel/devices/dev_txt.c

@@ -69 +69 @@
     bool_t    is_rx   = txt->is_rx;
 
-    assert( (pic_xp != XPTR_NULL) || (channel == 0) , __FUNCTION__ , 
+    assert( (pic_xp != XPTR_NULL) || (channel == 0) ,
             "PIC not initialised before TXT" );
 
@@ -107 +107 @@
                                       lid );
 
-        assert( (error == 0) , __FUNCTION__ , "cannot create server thread" );
+        assert( (error == 0) , "cannot create server thread" );
 
         // set "server" field in chdev descriptor
@@ -132 +132 @@
 
     // check channel argument
-    assert( (channel < CONFIG_MAX_TXT_CHANNELS) , __FUNCTION__ , "illegal channel index" );
+    assert( (channel < CONFIG_MAX_TXT_CHANNELS) , "illegal channel index" );
 
     // get extended pointer on remote TXT chdev descriptor
@@ -138 +138 @@
     else                     dev_xp = chdev_dir.txt_rx[channel];
 
-    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined TXT chdev descriptor" );
+    assert( (dev_xp != XPTR_NULL) , "undefined TXT chdev descriptor" );
 
     // register command in calling thread descriptor
@@ -221 +221 @@
     xptr_t  dev_xp = chdev_dir.txt_tx[0];
 
-    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ ,
+    assert( (dev_xp != XPTR_NULL) ,
     "undefined TXT0 chdev descriptor" );