Changeset 656 for trunk/kernel/syscalls/sys_read.c

Timestamp:

Dec 6, 2019, 12:07:51 PM (5 years ago)

Author:

alain

Message:

Fix several bugs in the FATFS and in the VFS,
related to the creation of big files requiring
more than 4 Kbytes (one cluster) on device.

File:

• trunk/kernel/syscalls/sys_read.c (modified) (6 diffs)

trunk/kernel/syscalls/sys_read.c

@@ -63 +63 @@
     cxy_t         file_cxy;        // remote file cluster identifier
     uint32_t      file_type;       // file type
-    uint32_t      file_attr;       // file_attribute
+    uint32_t      file_offset;     // file offset 
+    uint32_t      file_attr;       // file attributes
+    vfs_inode_t * inode_ptr;       // local pointer on file inode
     uint32_t      nbytes;          // number of bytes actually read
     reg_t         save_sr;         // required to enable IRQs during syscall
@@ -129 +131 @@
     file_cxy = GET_CXY( file_xp );
 
-    // get file type and attributes 
-    file_type   = hal_remote_l32( XPTR( file_cxy , &file_ptr->type ) );
-    file_attr   = hal_remote_l32( XPTR( file_cxy , &file_ptr->attr ) );
+    // get inode, file type, offset and attributes 
+    inode_ptr   = hal_remote_lpt( XPTR( file_cxy , &file_ptr->inode  ) );
+    file_type   = hal_remote_l32( XPTR( file_cxy , &file_ptr->type   ) );
+    file_offset = hal_remote_l32( XPTR( file_cxy , &file_ptr->offset ) );
+    file_attr   = hal_remote_l32( XPTR( file_cxy , &file_ptr->attr   ) );
 
     // enable IRQs
     hal_enable_irq( &save_sr );
 
-    // action depend on file type
+    // action depend on file type:
+
     if( file_type == INODE_TYPE_FILE )      // read from file mapper 
     {
@@ -152 +157 @@
             }
 
-        // move count bytes from mapper
+        // try to move count bytes from mapper
         nbytes = vfs_user_move( true,               // from mapper to buffer
                                 file_xp,
                                 vaddr, 
                                 count );
-        if( nbytes != count )
-        {
-
-#if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : thread[%x,‰x] cannot read %d bytes from file %d\n",
-__FUNCTION__, process->pid, this->trdid, count, file_id );
-#endif
-            this->errno = EIO;
-            hal_restore_irq( save_sr );
-            return -1;
-        }
     }
     else if( file_type == INODE_TYPE_DEV )  // read from TXT device
@@ -184 +178 @@
             txt_owner_xp  = hal_remote_l64( XPTR( chdev_cxy , &chdev_ptr->ext.txt.owner_xp ) );
 
-            // check TXT_RX ownership
+            // wait for TXT_RX ownership
             if ( process_owner_xp != txt_owner_xp )
             {
@@ -202 +196 @@
         }
 
-        // move count bytes from device
+        // try to move count bytes from TXT device
         nbytes = devfs_user_move( true,             // from device to buffer
                                   file_xp,
                                   vaddr,
                                   count );
-        if( nbytes != count )
-        {
-
-#if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : thread[%x,‰x] cannot read data from file %d\n",
-__FUNCTION__, process->pid, this->trdid, file_id );
-#endif
-            this->errno = EIO;
-            hal_restore_irq( save_sr );
-            return -1;
-        }
     }
     else    // not FILE and not DEV
@@ -229 +212 @@
         hal_restore_irq( save_sr );
                 return -1;
+    }
+
+    // check error
+    if( nbytes == 0xFFFFFFFF )
+    {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : thread[%x,‰x] cannot read data from file %d\n",
+__FUNCTION__, process->pid, this->trdid, file_id );
+#endif
+        this->errno = EIO;
+        hal_restore_irq( save_sr );
+        return -1;
     }