Changeset 401 for trunk/kernel/vfs/fatfs.c

Timestamp:

Aug 17, 2017, 3:02:18 PM (7 years ago)

Author:

alain

Message:

Few bugs in VMM

File:

• trunk/kernel/vfs/fatfs.c (modified) (6 diffs)

trunk/kernel/vfs/fatfs.c

@@ -26 +26 @@
 #include <hal_special.h>
 #include <printk.h>
+#include <thread.h>
 #include <kmem.h>
 #include <ppm.h>
@@ -462 +463 @@
                                 bool_t   to_mapper )
 {
-    error_t error;
+    error_t       error;
+    vfs_inode_t * inode;
+    mapper_t    * mapper;
+    uint32_t      index;       // page index in mapper
+    uint8_t     * buffer;      // page base address in mapper
+    uint32_t      count;       // number of sectors in a page
+    uint32_t      lba;         // block address on device
+    fatfs_ctx_t * fatfs_ctx;   // pointer on local FATFS context
 
     // get pointer on source mapper and page index from page descriptor
-    mapper_t * mapper = page->mapper;
-    uint32_t   index  = page->index;
+    mapper = page->mapper;
+    index  = page->index;
 
     // get VFS inode pointer from mapper
-    vfs_inode_t * inode = mapper->inode;
-
-    fatfs_dmsg("\n[INFO] %s : enter for inode %x / page_index = %d / mapper = %x\n",
-               __FUNCTION__ , inode , index , mapper );
-
-    // get memory buffer base address
+    inode = mapper->inode;
+
+    fatfs_dmsg("\n[INFO] %s : core[%x,%d] enter for inode %x / page_id = %d / mapper = %x\n",
+    __FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , inode , index , mapper );
+
+    // get page to move base address
     xptr_t base_xp = ppm_page2base( XPTR( local_cxy , page ) );
-    uint8_t * buffer = (uint8_t *)GET_PTR( base_xp );
+    buffer = (uint8_t *)GET_PTR( base_xp );
  
-    // get number of sectors from FATFS context
-    fatfs_ctx_t * fatfs_ctx = (fatfs_ctx_t *)fs_context[FS_TYPE_FATFS].extend;
-    uint32_t count = fatfs_ctx->sectors_per_cluster;
-
-    // analyse the mapper type : FAT or normal inode
-    if( inode == NULL )  // it is the FAT mapper
+    // get number of sectors for one page (from FATFS context)
+    fatfs_ctx = (fatfs_ctx_t *)fs_context[FS_TYPE_FATFS].extend;
+    count = fatfs_ctx->sectors_per_cluster;
+
+    // test FAT/normal inode
+    if( inode == NULL )      // it is the FAT mapper
     {
         // get lba from page index 
-        uint32_t lba = fatfs_ctx->fat_begin_lba + (count * index);
+        lba = fatfs_ctx->fat_begin_lba + (count * index);
  
-        fatfs_dmsg("\n[INFO] %s : for FAT / lba = %d\n",
-                   __FUNCTION__ , lba );
+        fatfs_dmsg("\n[INFO] %s : core[%x,%d] access FAT on device / lba = %d\n",
+        __FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , lba );
 
         // access device
@@ -496 +504 @@
 
         if( error ) return EIO;
-
-        fatfs_dmsg("\n[INFO] %s : exit for FAT / page_index = %d / mapper = %x\n",
-                   __FUNCTION__ , index , mapper );
-    }
-    else                 // it is a normal inode mapper
+    }
+    else                     // it is a normal inode mapper
     {
         uint32_t  searched_cluster_id;
@@ -506 +511 @@
         // get first_cluster_id from inode extension
         uint32_t  first_cluster_id = (uint32_t)(intptr_t)inode->extend;
-
-        fatfs_dmsg("\n[INFO] %s : for inode %x / first_cluster_id = %d\n",
-                   __FUNCTION__ , inode , first_cluster_id );
 
         // compute cluster_id
@@ -544 +546 @@
 
         // get lba from cluster_id
-        uint32_t lba = fatfs_lba_from_cluster( fatfs_ctx , searched_cluster_id );
-
-        fatfs_dmsg("\n[INFO] %s : for inode %x / page = %d / cluster_id = %d / lba = %x\n",
-                   __FUNCTION__ , inode , index , searched_cluster_id , lba );
+        lba = fatfs_lba_from_cluster( fatfs_ctx , searched_cluster_id );
+
+        fatfs_dmsg("\n[INFO] %s : core[%x,%d] access device for inode %x / cluster_id = %d\n",
+        __FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , inode , first_cluster_id );
 
         // access device
@@ -554 +556 @@
 
         if( error ) return EIO;
-
-        fatfs_dmsg("\n[INFO] %s : exit for inode %x / page_index = %d / mapper = %x\n",
-                   __FUNCTION__ , inode , index , mapper );
-    }
+    }
+
+    fatfs_dmsg("\n[INFO] %s : core[%x,%d] exit for inode %x / page_id = %d / mapper = %x\n",
+    __FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , inode , index , mapper );
 
     return 0;