Changeset 315 for trunk/kernel/vfs

Timestamp:

Aug 3, 2017, 10:15:18 AM (7 years ago)

Author:

alain

Message:

Redefine the fuctions ppm_base2page() / ppm_page2base() / ppm_page2ppn() / ppm_ppn2page() / ppm_base2ppn() / ppm_ppn2base(),
to use explicitely extended pointers.

Location:

trunk/kernel/vfs

Files:

• fatfs.c (modified) (3 diffs)
• vfs.c (modified) (1 diff)

trunk/kernel/vfs/fatfs.c

@@ -296 +296 @@
 
         // get pointer on buffer for current page
-        current_page_buffer = (uint32_t *)ppm_page2vaddr( current_page_desc );
+        xptr_t base_xp = ppm_page2base( XPTR( local_cxy , current_page_desc ) );
+        current_page_buffer = (uint32_t *)GET_PTR( base_xp );
 
         // get FAT slot content 
@@ -473 +474 @@
 
     // get memory buffer base address
-    uint8_t * buffer = (uint8_t *)ppm_page2vaddr( page );
+    xptr_t base_xp = ppm_page2base( XPTR( local_cxy , page ) );
+    uint8_t * buffer = (uint8_t *)GET_PTR( base_xp );
  
     // get number of sectors from FATFS context
@@ -604 +606 @@
 
         // get page base
-        base = ppm_page2vaddr( page );
+        xptr_t base_xp = ppm_page2base( XPTR( local_cxy , page ) );
+        base = (uint8_t *)GET_PTR( base_xp );
 
 #if (CONFIG_FATFS_DEBUG > 1)

trunk/kernel/vfs/vfs.c

@@ -702 +702 @@
         else
         {
-            rpc_mapper_move_user_client( file_cxy,
-                                         mapper,
-                                         to_buffer,
-                                         true,          // user buffer
-                                         file_offset,
-                                         (uint64_t)(intptr_t)buffer,
-                                         size,
-                                         &error );
+            rpc_mapper_move_buffer_client( file_cxy,
+                                           mapper,
+                                           to_buffer,
+                                           true,          // user buffer
+                                           file_offset,
+                                           (uint64_t)(intptr_t)buffer,
+                                           size,
+                                           &error );
         }