Changeset 647 for trunk/kernel/fs

Timestamp:

Oct 22, 2019, 1:48:51 PM (5 years ago)

Author:

alain

Message:

...miscelaneous...

Location:

trunk/kernel/fs

Files:

• fatfs.c (modified) (9 diffs)
• vfs.c (modified) (2 diffs)

trunk/kernel/fs/fatfs.c

@@ -575 +575 @@
     
     // update the FS_INFO sector on IOC device
-    return dev_ioc_sync_write( fs_info_buffer_xp , fs_info_lba , 1 );
+    return dev_ioc_move_data( IOC_SYNC_WRITE , fs_info_buffer_xp , fs_info_lba , 1 );
  
 }  // end fatfs_update_ioc_fsinfo()
@@ -1115 +1115 @@
 
     // load the BOOT record from device
-    error = dev_ioc_sync_read( buffer_xp , 0 , 1 );
+    error = dev_ioc_move_data( IOC_SYNC_READ , buffer_xp , 0 , 1 );
 
     if ( error )
@@ -1175 +1175 @@
 
     // load the FS_INFO record from device
-    error = dev_ioc_sync_read( buffer_xp , fs_info_lba , 1 );
+    error = dev_ioc_move_data( IOC_SYNC_READ , buffer_xp , fs_info_lba , 1 );
 
     if ( error )
@@ -2394 +2394 @@
 
     // copy FS_INFO sector from IOC to local buffer
-    error = dev_ioc_sync_read( tmp_buf_xp , fs_info_lba , 1 );
+    error = dev_ioc_move_data( IOC_SYNC_READ , tmp_buf_xp , fs_info_lba , 1 );
 
     if ( error )
@@ -2431 +2431 @@
 
         // update the FS_INFO sector on IOC device
-        error = dev_ioc_sync_write( fs_info_buffer_xp , fs_info_lba , 1 );
+        error = dev_ioc_move_data( IOC_SYNC_WRITE , fs_info_buffer_xp , fs_info_lba , 1 );
 
         if ( error )
@@ -2750 +2750 @@
     // get page base address
     xptr_t    buffer_xp  = ppm_page2base( page_xp );
-    uint8_t * buffer_ptr = (uint8_t *)GET_PTR( buffer_xp );
  
     // get inode pointer from mapper
@@ -2759 +2758 @@
 printk("\n[%s] thread[%x,%x] enters : %s / cxy %x / mapper %x / inode %x / page %x\n",
 __FUNCTION__, this->process->pid, this->trdid,
-dev_ioc_cmd_str( cmd_type ), page_cxy, mapper_ptr, inode_ptr, buffer_ptr );
+dev_ioc_cmd_str( cmd_type ), page_cxy, mapper_ptr, inode_ptr, GET_PTR(buffer_xp) );
 #endif
 
@@ -2768 +2767 @@
         uint32_t      lba = fatfs_ctx->fat_begin_lba + (page_id << 3);
  
-        // access device
-        if     (cmd_type == IOC_SYNC_READ ) error = dev_ioc_sync_read ( buffer_xp  , lba , 8 );
-        else if(cmd_type == IOC_SYNC_WRITE) error = dev_ioc_sync_write( buffer_xp  , lba , 8 );
-        else if(cmd_type == IOC_READ      ) error = dev_ioc_read      ( buffer_ptr , lba , 8 );
-        else if(cmd_type == IOC_WRITE     ) error = dev_ioc_write     ( buffer_ptr , lba , 8 );
-        else                                error = -1;
+        // access IOC device
+        error = dev_ioc_move_data( cmd_type , buffer_xp , lba , 8 );
 
         if( error )
@@ -2831 +2826 @@
         uint32_t lba = fatfs_lba_from_cluster( fatfs_ctx , searched_cluster );
 
-        // access device
-        if     (cmd_type == IOC_SYNC_READ ) error = dev_ioc_sync_read ( buffer_xp  , lba , 8 );
-        else if(cmd_type == IOC_SYNC_WRITE) error = dev_ioc_sync_write( buffer_xp  , lba , 8 );
-        else if(cmd_type == IOC_READ      ) error = dev_ioc_read      ( buffer_ptr , lba , 8 );
-        else if(cmd_type == IOC_WRITE     ) error = dev_ioc_write     ( buffer_ptr , lba , 8 );
-        else                                error = -1;
+        // access IOC device
+        error = dev_ioc_move_data( cmd_type , buffer_xp , lba , 8 );
 
         if( error )

trunk/kernel/fs/vfs.c

@@ -681 +681 @@
     process_t * process = this->process;
 
-#if DEBUG_VFS_OPEN
-uint32_t cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_VFS_OPEN < cycle )
-printk("\n[%s] thread[%x,%x] enter for <%s> / root_inode (%x,%x) / cycle %d\n",
-__FUNCTION__, process->pid, this->trdid, path, GET_CXY(root_xp), GET_PTR(root_xp), cycle );
-#endif
-
     // compute lookup working mode
     lookup_mode = VFS_LOOKUP_OPEN;
@@ -694 +687 @@
     if( (flags & O_EXCL   )      )  lookup_mode |= VFS_LOOKUP_EXCL;
  
+#if DEBUG_VFS_OPEN
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( DEBUG_VFS_OPEN < cycle )
+printk("\n[%s] thread[%x,%x] enter for <%s> / root_inode (%x,%x) / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, path, GET_CXY(root_xp), GET_PTR(root_xp), cycle );
+#endif
+
     // compute attributes for the created file
     file_attr = 0;