Changeset 492 for trunk/kernel/devices/dev_ioc.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_ioc.c (modified) (4 diffs)

trunk/kernel/devices/dev_ioc.c

@@ -44 +44 @@
     xptr_t  pic_xp  = chdev_dir.pic;
 
-    assert( (pic_xp != XPTR_NULL) , __FUNCTION__ , "PIC not initialised before IOC" );
+    assert( (pic_xp != XPTR_NULL) , "PIC not initialised before IOC" );
 
     // get implementation and channel from chdev descriptor
@@ -75 +75 @@
                                   lid );
 
-    assert( (error == 0) , __FUNCTION__ , "cannot create server thread" );
+    assert( (error == 0) , "cannot create server thread" );
 
     // set "server" field in chdev descriptor
@@ -111 +111 @@
     xptr_t  dev_xp = chdev_dir.ioc[0];
 
-    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined IOC chdev descriptor" );
+    assert( (dev_xp != XPTR_NULL) , "undefined IOC chdev descriptor" );
 
     // register command in calling thread descriptor
@@ -199 +199 @@
     xptr_t  ioc_xp = chdev_dir.ioc[0];
 
-    assert( (ioc_xp != XPTR_NULL) , __FUNCTION__ , "undefined IOC chdev descriptor" );
+    assert( (ioc_xp != XPTR_NULL) , "undefined IOC chdev descriptor" );
 
     // register command in calling thread descriptor