Changeset 673 for trunk/kernel/fs/fatfs.c

Timestamp:

Nov 19, 2020, 11:54:16 PM (4 years ago)

Author:

alain

Message:

Introduce the DEBUG_VFS_ERROR in kernel_config to make
error messges display conditional.

File:

• trunk/kernel/fs/fatfs.c (modified) (16 diffs)

trunk/kernel/fs/fatfs.c

@@ -1098 +1098 @@
     error_t    error;
 
-assert( (searched_page_id > first_page_id) ,
+assert( __FUNCTION__, (searched_page_id > first_page_id) ,
 "searched_page_id must be larger than first_page_id\n");
 
@@ -1239 +1239 @@
 
 // check arguments
-assert( (mapper_xp != XPTR_NULL) , "mapper pointer is NULL\n" );
-assert( (name      != NULL     ) , "child name is undefined\n" );
+assert( __FUNCTION__, (mapper_xp != XPTR_NULL) , "mapper pointer is NULL\n" );
+assert( __FUNCTION__, (name      != NULL     ) , "child name is undefined\n" );
 
 #if DEBUG_FATFS_SCAN_DIRECTORY
@@ -1882 +1882 @@
  
 // check arguments
-assert( (parent_inode_xp != XPTR_NULL) , "parent_inode_xp argument is NULL\n" );
-assert( (dentry_ptr      != NULL)      , "dentry_ptr argument is NULL\n" );
+assert( __FUNCTION__, (parent_inode_xp != XPTR_NULL) , "parent_inode_xp argument is NULL\n" );
+assert( __FUNCTION__, (dentry_ptr      != NULL)      , "dentry_ptr argument is NULL\n" );
 
     // get directory inode cluster and local pointer 
@@ -2153 +2153 @@
                     else if (i == 11)                                // ATTR
                     {
-                        if (type == INODE_TYPE_DIR)  buf[i] = 0x10;
+                        if (type == FILE_TYPE_DIR)  buf[i] = 0x10;
                         else                         buf[i] = 0x20;
                     }
@@ -2236 +2236 @@
 
 // check arguments
-assert( (parent_inode_xp != XPTR_NULL) , "parent_inode_xp argument is NULL\n" );
-assert( (dentry_ptr      != NULL)      , "dentry_ptr argument is NULL\n" );
+assert( __FUNCTION__, (parent_inode_xp != XPTR_NULL) , "parent_inode_xp argument is NULL\n" );
+assert( __FUNCTION__, (dentry_ptr      != NULL)      , "dentry_ptr argument is NULL\n" );
 
     // get directory inode cluster and local pointer 
@@ -2344 +2344 @@
 
 // check for LFN entry
-assert( (fatfs_get_remote_record( DIR_ATTR, base_xp + offset ) == ATTR_LONG_NAME_MASK ),
+assert( __FUNCTION__, (fatfs_get_remote_record( DIR_ATTR, base_xp + offset ) == ATTR_LONG_NAME_MASK ),
 "this directory entry must be a LFN\n");
 
@@ -2395 +2395 @@
 
 // check arguments
-assert( (parent_inode_xp != XPTR_NULL)  , "parent_inode_xp is NULL\n" );
-assert( (dentry_ptr      != NULL ) , "dentry_ptr is NULL\n" );
+assert( __FUNCTION__, (parent_inode_xp != XPTR_NULL)  , "parent_inode_xp is NULL\n" );
+assert( __FUNCTION__, (dentry_ptr      != NULL ) , "dentry_ptr is NULL\n" );
 
     // get parent inode cluster and local pointer
@@ -2445 +2445 @@
 
     // update the child inode "type", "size", and "extend" fields
-    vfs_inode_type_t type = (is_dir) ? INODE_TYPE_DIR : INODE_TYPE_FILE;
+    vfs_file_type_t type = (is_dir) ? FILE_TYPE_DIR : FILE_TYPE_REG;
 
     hal_remote_s32( XPTR( child_cxy , &child_inode_ptr->type   ) , type );
@@ -2486 +2486 @@
 
 // check arguments
-assert( (parent_inode_xp != XPTR_NULL) , "parent_inode_xp argument is NULL\n" );
-assert( (dentry_ptr      != NULL)      , "dentry_ptr argument NULL\n" );
+assert( __FUNCTION__, (parent_inode_xp != XPTR_NULL) , "parent_inode_xp argument is NULL\n" );
+assert( __FUNCTION__, (dentry_ptr      != NULL)      , "dentry_ptr argument NULL\n" );
 
     // get child inode cluster and local pointer
@@ -2574 +2574 @@
 
 // check arguments
-assert( (parent_inode_xp  != XPTR_NULL) , "parent_inode_xp argument is NULL\n" );
-assert( (dentry_ptr       != NULL)      , "dentry_ptr argument is NULL\n" );
+assert( __FUNCTION__, (parent_inode_xp  != XPTR_NULL) , "parent_inode_xp argument is NULL\n" );
+assert( __FUNCTION__, (dentry_ptr       != NULL)      , "dentry_ptr argument is NULL\n" );
 
     // get parent directory cluster ans local pointer
@@ -2680 +2680 @@
 
 // check mapper pointer
-assert( (mapper != NULL) , "mapper is NULL\n");
+assert( __FUNCTION__, (mapper != NULL) , "mapper is NULL\n");
     
 // TODO handle the detailed flag
-assert( (detailed == false), "detailed argument not supported/n");
+assert( __FUNCTION__, (detailed == false), "detailed argument not supported/n");
 
     char       cname[CONFIG_VFS_MAX_NAME_LENGTH];  // name extracted from each dentry
@@ -2829 +2829 @@
 
 // check inode pointer and cluster index
-assert( (inode_xp != XPTR_NULL)          , "inode pointer undefined\n" );
+assert( __FUNCTION__, (inode_xp != XPTR_NULL)          , "inode pointer undefined\n" );
 
 #if DEBUG_FATFS_SYNC_INODE
@@ -2848 +2848 @@
     mapper    = hal_remote_lpt( XPTR( inode_cxy , &inode_ptr->mapper ) );
 
-assert( (mapper != NULL) , "mapper pointer is NULL\n" );     
+assert( __FUNCTION__, (mapper != NULL) , "mapper pointer is NULL\n" );     
 
     // get inode type and size
@@ -2854 +2854 @@
     type = hal_remote_l32( XPTR( inode_cxy , &inode_ptr->type ) );
 
-assert( (type == INODE_TYPE_FILE) , "inode is not a file\n" );     
+assert( __FUNCTION__, (type == FILE_TYPE_REG) , "inode is not a file\n" );     
 
     // compute number of pages
@@ -3009 +3009 @@
 
 // check inode pointer 
-assert( (inode_xp != XPTR_NULL) , "inode pointer is NULL\n" );
+assert( __FUNCTION__, (inode_xp != XPTR_NULL) , "inode pointer is NULL\n" );
 
     // get inode cluster and local pointer
@@ -3020 +3020 @@
 
 // check first cluster index
-assert( (first_cluster_id != 0) , "inode extend is NULL\n" );
+assert( __FUNCTION__, (first_cluster_id != 0) , "inode extend is NULL\n" );
 
 #if DEBUG_FATFS_RELEASE_INODE