Changeset 492 for trunk/hal/tsar_mips32/drivers/soclib_nic.c

Timestamp:

Aug 22, 2018, 11:55:48 PM (5 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/hal/tsar_mips32/drivers/soclib_nic.c (modified) (4 diffs)

trunk/hal/tsar_mips32/drivers/soclib_nic.c

@@ -53 +53 @@
 
     // allocate memory for chbuf descriptor (one page)
-    assert( (sizeof(nic_chbuf_t) <= CONFIG_PPM_PAGE_SIZE ) , __FUNCTION__ ,
+    assert( (sizeof(nic_chbuf_t) <= CONFIG_PPM_PAGE_SIZE ) ,
             "chbuf descriptor exceeds one page" );
 
@@ -62 +62 @@
     nic_chbuf_t * chbuf = (nic_chbuf_t *)kmem_alloc( &req );
 
-    assert( (chbuf != NULL) , __FUNCTION__ , 
+    assert( (chbuf != NULL) ,
              "cannot allocate chbuf descriptor" );
 
@@ -72 +72 @@
     // allocate containers (one page per container)
     // and complete chbuf descriptor initialization
-    assert( (CONFIG_PPM_PAGE_SIZE == 4096) , __FUNCTION__ ,
+    assert( (CONFIG_PPM_PAGE_SIZE == 4096) ,
             "chbuf container must be 4 Kbytes" );
 
@@ -79 +79 @@
         uint32_t * container = (uint32_t *)kmem_alloc( &req );   
 
-        assert( (container != NULL) , __FUNCTION__ , 
+        assert( (container != NULL) ,
                 "cannot allocate container" );