Changeset 492 for trunk/kernel/kern/kernel_init.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/kern/kernel_init.c (modified) (19 diffs)

trunk/kernel/kern/kernel_init.c

@@ -231 +231 @@
         if (func == DEV_FUNC_TXT )
         {
-            assert( (channels > 0) , __FUNCTION__ , "number of TXT channels cannot be 0\n");
+            assert( (channels > 0) , "number of TXT channels cannot be 0\n");
 
             // initializes TXT_TX[0] chdev
@@ -298 +298 @@
         if( func == DEV_FUNC_MMC )  
         {
-            assert( (channels == 1) , __FUNCTION__ , 
-                    "MMC device must be single channel\n" );
+            assert( (channels == 1) , "MMC device must be single channel\n" );
 
             // create chdev in local cluster
@@ -308 +307 @@
                                       base );
 
-            assert( (chdev_ptr != NULL) , __FUNCTION__ ,
+            assert( (chdev_ptr != NULL) ,
                     "cannot allocate memory for MMC chdev\n" );
             
@@ -344 +343 @@
                                           base );
 
-                assert( (chdev_ptr != NULL) , __FUNCTION__ , 
-                        "cannot allocate memory for DMA chdev" );
+                assert( (chdev_ptr != NULL) , "cannot allocate memory for DMA chdev" );
             
                 // make DMA specific initialisation
@@ -420 +418 @@
 
         // check PIC device initialized
-        assert( (chdev_dir.pic != XPTR_NULL ) , __FUNCTION__ ,
+        assert( (chdev_dir.pic != XPTR_NULL ) ,
               "PIC device must be initialized before other devices\n" );
 
@@ -428 +426 @@
                   (func == DEV_FUNC_TXT) ||
                   (func == DEV_FUNC_NIC) ||
-                  (func == DEV_FUNC_FBF) ) , __FUNCTION__ ,
+                  (func == DEV_FUNC_FBF) ) ,
                   "undefined external peripheral type\n" );
 
@@ -456 +454 @@
                                           base );
 
-                    assert( (chdev != NULL), __FUNCTION__ ,
+                    assert( (chdev != NULL),
                             "cannot allocate external device" );
 
@@ -544 +542 @@
     }
 
-    assert( found , __FUNCTION__ , "PIC device not found\n" );
+    assert( found , "PIC device not found\n" );
 
     // allocate and initialize the PIC chdev in cluster 0
@@ -553 +551 @@
                           base );
 
-    assert( (chdev != NULL), __FUNCTION__ , "no memory for PIC chdev\n" );
+    assert( (chdev != NULL), "no memory for PIC chdev\n" );
 
     // make PIC device type specific initialisation
@@ -607 +605 @@
             else if((func == DEV_FUNC_TXT) && (is_rx == 0)) ptr = &iopic_input.txt_tx[channel];
             else if((func == DEV_FUNC_TXT) && (is_rx != 0)) ptr = &iopic_input.txt_rx[channel];
-            else if((func == DEV_FUNC_NIC) && (is_rx == 0)) ptr = &iopic_input.nic_tx[channel]; 
-            else if((func == DEV_FUNC_NIC) && (is_rx != 0)) ptr = &iopic_input.nic_rx[channel]; 
-            else if( func == DEV_FUNC_IOB )                 ptr = &iopic_input.iob; 
-            else     assert( false , __FUNCTION__ , "illegal source device for IOPIC input" );
+            else if((func == DEV_FUNC_NIC) && (is_rx == 0)) ptr = &iopic_input.nic_tx[channel];
+            else if((func == DEV_FUNC_NIC) && (is_rx != 0)) ptr = &iopic_input.nic_rx[channel];
+            else if( func == DEV_FUNC_IOB )                 ptr = &iopic_input.iob;
+            else     assert( false , "illegal source device for IOPIC input" );
 
             // set one entry in all "iopic_input" structures
@@ -697 +695 @@
                 if     ( func == DEV_FUNC_MMC ) lapic_input.mmc = id;
                 else if( func == DEV_FUNC_DMA ) lapic_input.dma[channel] = id;
-                else assert( false , __FUNCTION__ , "illegal source device for LAPIC input" );
+                else assert( false , "illegal source device for LAPIC input" );
             }
         }
@@ -818 +816 @@
     if( error )
     {
-        assert( false , __FUNCTION__ ,
+        assert( false ,
         "illegal core identifiers gid = %x / cxy = %x / lid = %d",
         core_lid , core_cxy , core_lid );
@@ -830 +828 @@
         if( error )
         {
-            assert( false , __FUNCTION__ ,
+            assert( false ,
             "cannot initialise cluster %x", local_cxy );
         }
@@ -950 +948 @@
             fatfs_ctx_t * fatfs_ctx = fatfs_ctx_alloc();
 
-            assert( (fatfs_ctx != NULL) , __FUNCTION__ ,
+            assert( (fatfs_ctx != NULL) ,
                     "cannot create FATFS context in cluster 0\n" );
 
@@ -973 +971 @@
                                       &vfs_root_inode_xp );                // return
 
-            assert( (error == 0) , __FUNCTION__ , 
+            assert( (error == 0) ,
                     "cannot create VFS root inode\n" );
 
@@ -987 +985 @@
             vfs_ctx_t   * vfs_ctx = &fs_context[FS_TYPE_FATFS];
             assert( (((fatfs_ctx_t *)vfs_ctx->extend)->sectors_per_cluster == 8),
-            __FUNCTION__ , "illegal value for FATFS context in cluster %x\n", local_cxy );
+             "illegal value for FATFS context in cluster %x\n", local_cxy );
         }
         else
         {
-            assert( false , __FUNCTION__ ,
+            assert( false ,
             "root FS must be FATFS" );
         }
@@ -1028 +1026 @@
             fatfs_ctx_t * local_fatfs_ctx = fatfs_ctx_alloc();
 
-            assert( (local_fatfs_ctx != NULL) , __FUNCTION__ ,
+            assert( (local_fatfs_ctx != NULL) ,
             "cannot create FATFS context in cluster %x\n", local_cxy );
 
@@ -1050 +1048 @@
             // 7. check initialisation
             assert( (((fatfs_ctx_t *)vfs_ctx->extend)->sectors_per_cluster == 8),
-            __FUNCTION__ , "illegal value for FATFS context in cluster %x\n", local_cxy );
+            "illegal value for FATFS context in cluster %x\n", local_cxy );
         }
 
@@ -1089 +1087 @@
         devfs_ctx_t * devfs_ctx = devfs_ctx_alloc();
 
-        assert( (devfs_ctx != NULL) , __FUNCTION__ ,
+        assert( (devfs_ctx != NULL) ,
                 "cannot create DEVFS context in cluster IO\n");