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

trunk/kernel/devices/dev_nic.c

@@ -43 +43 @@
     xptr_t  pic_xp  = chdev_dir.pic;
 
-    assert( (pic_xp != XPTR_NULL) , __FUNCTION__ , "ICU not initialised before NIC" );
+    assert( (pic_xp != XPTR_NULL) , "ICU not initialised before NIC" );
 
     // get "impl" , "channel" , "is_rx" fields from chdev descriptor
@@ -74 +74 @@
                                   lid ); 
 
-    assert( (error == 0) , __FUNCTION__ , "cannot create server thread" );
+    assert( (error == 0) , "cannot create server thread" );
 
     // set "server" field in chdev descriptor
@@ -112 +112 @@
     chdev_t  * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
-    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined NIC chdev descriptor" );
-
-    assert( (dev_cxy == local_cxy) , __FUNCTION__ , " chdev must be local" );
+    assert( (dev_xp != XPTR_NULL) , "undefined NIC chdev descriptor" );
+
+    assert( (dev_cxy == local_cxy) , " chdev must be local" );
 
     // initialize command in thread descriptor
@@ -190 +190 @@
     chdev_t  * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
-    assert ( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined NIC chdev descriptor" );
-
-    assert( (dev_cxy == local_cxy) , __FUNCTION__ , " chdev must be local" );
+    assert( (dev_xp != XPTR_NULL) , "undefined NIC chdev descriptor" );
+
+    assert( (dev_cxy == local_cxy) , " chdev must be local" );
 
     // initialize command in thread descriptor