Changeset 492 for trunk/hal/tsar_mips32/drivers

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.

Location:

trunk/hal/tsar_mips32/drivers

Files:

• soclib_bdv.c (modified) (1 diff)
• soclib_nic.c (modified) (4 diffs)
• soclib_pic.c (modified) (9 diffs)
• soclib_tty.c (modified) (3 diffs)

trunk/hal/tsar_mips32/drivers/soclib_bdv.c

@@ -219 +219 @@
     else
     {
-        assert( false , __FUNCTION__ , "IOC_SYNC_READ should not use IRQ" );
+        assert( false , "IOC_SYNC_READ should not use IRQ" );
     } 
 

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" );
         

trunk/hal/tsar_mips32/drivers/soclib_pic.c

@@ -57 +57 @@
     soclib_pic_cluster_t * ext_ptr = LOCAL_CLUSTER->pic_extend;
 
-    assert( (ext_ptr->first_free_wti < ext_ptr->wti_nr) , __FUNCTION__ ,
+    assert( (ext_ptr->first_free_wti < ext_ptr->wti_nr) ,
             "no free WTI found : too much external IRQs\n");
 
@@ -146 +146 @@
         if( index < LOCAL_CLUSTER->cores_nr )   // it is an IPI
         {
-            assert( (index == core->lid) , __FUNCTION__ , "illegal IPI index" );
+            assert( (index == core->lid) , "illegal IPI index" );
 
 #if DEBUG_HAL_IRQS
@@ -229 +229 @@
         index = pti_status - 1;
 
-        assert( (index == core->lid) , __FUNCTION__ , "unconsistent PTI index\n");
+        assert( (index == core->lid) , "unconsistent PTI index\n");
 
 #if DEBUG_HAL_IRQS
@@ -292 +292 @@
         core_ext_ptr = kmem_alloc( &req );
 
-        assert( (core_ext_ptr != NULL) , __FUNCTION__ ,
+        assert( (core_ext_ptr != NULL) ,
                 "cannot allocate memory for core extension\n");
     
@@ -309 +309 @@
     cluster_ext_ptr = kmem_alloc( &req );
 
-    assert( (cluster_ext_ptr != NULL) , __FUNCTION__ ,
+    assert( (cluster_ext_ptr != NULL) ,
             "cannot allocate memory for cluster extension\n");
 
@@ -381 +381 @@
         else if( (func == DEV_FUNC_NIC) && !is_rx ) hwi_id = iopic_input.nic_tx[channel];
         else if(  func == DEV_FUNC_IOB            ) hwi_id = iopic_input.iob;
-        else      assert( false , __FUNCTION__ , "illegal device functionnal type\n");
+        else      assert( false , "illegal device functionnal type\n");
 
         // get a WTI mailbox from local XCU descriptor  
@@ -439 +439 @@
     else
     {
-        assert( false , __FUNCTION__ , "illegal device functionnal type\n" );
+        assert( false , "illegal device functionnal type\n" );
     } 
 }  // end soclib_pic_bind_irq();
@@ -474 +474 @@
     else
     {
-        assert( false , __FUNCTION__ , "illegal IRQ type\n" );
+        assert( false , "illegal IRQ type\n" );
     }
 } // end soclib_pic_enable_irq()
@@ -509 +509 @@
     else
     {
-        assert( false , __FUNCTION__ , "illegal IRQ type\n" );
+        assert( false , "illegal IRQ type\n" );
     }
 } // end soclib_pic_enable_irq()

trunk/hal/tsar_mips32/drivers/soclib_tty.c

@@ -233 +233 @@
     else
     {
-        assert( false , __FUNCTION__ , "illegal TXT command\n" );
+        assert( false , "illegal TXT command\n" );
     }
 
@@ -329 +329 @@
                
                 // check process exist
-                assert( (owner_xp != XPTR_NULL) , __FUNCTION__, 
+                assert( (owner_xp != XPTR_NULL) ,
                 "TXT owner process not found\n" );
 
@@ -387 +387 @@
 
                 // check process exist
-                assert( (owner_xp != XPTR_NULL) , __FUNCTION__,
+                assert( (owner_xp != XPTR_NULL) ,
                 "TXT owner process not found\n" );