Changeset 493

Timestamp:

Aug 22, 2018, 11:56:33 PM (6 years ago)

Author:

viala@…

Message:

[hal/drivers] Use asserts and fix a bad call.

We called hal_core_sleep with arguments, the function takes no one.
Now we use an assert.

File:

• trunk/hal/tsar_mips32/drivers/soclib_nic.c (modified) (5 diffs)

trunk/hal/tsar_mips32/drivers/soclib_nic.c

@@ -127 +127 @@
             cont_id = chbuf->cont_id;
             
-            if( chbuf->full[cont_id] == 0 )  // container empty
-            {
-                printk("PANIC in %s : read an empty container\n", __FUNCTION__ );
-                hal_core_sleep();
-            }
+            assert( chbuf->full[cont_id] == 0 , "Read an empty container\n" );
 
             // get pointer on container and header 
@@ -145 +141 @@
             npackets  = header[0];
 
-            if( pkt_id >= npackets )  // packet index too large
-            {
-                printk("PANIC in %s : read a non readable container\n", __FUNCTION__ );
-                hal_core_sleep();
-            }
+            assert( pkt_id >= npackets,
+                "Read a non readable container, packet index too large\n");
 
             // move the packet from container to buffer
@@ -169 +162 @@
             word_id = chbuf->word_id;
 
-            if( chbuf->full[cont_id] != 0 )  // container full
-            {
-                printk("PANIC in %s : write to a full container\n", __FUNCTION__ );
-                hal_core_sleep();
-            }
+            assert( chbuf->full[cont_id] != 0, "Write to a full container\n" );
 
             // get pointer on container and header 
@@ -179 +168 @@
             header    = (uint16_t *)container;
 
-            if( length > ((1024 - word_id)<<2) )  // packet length too large
-            {
-                printk("PANIC in %s : write to a non writable container\n", __FUNCTION__ );
-                hal_core_sleep();
-            }
+            assert( length > ((1024 - word_id) << 2),
+                "Write to a non writable container, packet length too large\n");
 
             // update packet length in container header
@@ -309 +295 @@
     uint32_t status = hal_remote_lw( XPTR( cxy_nic , offset ) );
 
-    if( status != 0 ) hal_core_sleep("%s : illegal address\n", __FUNCTION__ );
-    
+    assert( status != 0, "Illegal address: \n" );
+
     // unblock server thread 
     thread_t * server = chdev->server;