Changeset 623 for soft/giet_vm/giet_fat32

Timestamp:

Jul 17, 2015, 4:34:54 PM (9 years ago)

Author:

guerin

Message:

fat32: use struct for _fat_file_info(), pass is_dir

Location:

soft/giet_vm/giet_fat32

Files:

• fat32.c (modified) (4 diffs)
• fat32.h (modified) (2 diffs)

soft/giet_vm/giet_fat32/fat32.c

@@ -3056 +3056 @@
 /////////////////////////////////////////////////////////////////////////////////
 // This function implements the giet_fat_file_info() system call.
-// It returns the size and the current offset value for a file identified 
-// by the "fd_id" argument. 
+// It returns the size, the current offset and the directory info for a file
+// identified by the "fd_id" argument.
 /////////////////////////////////////////////////////////////////////////////////
 // Returns  0 if success.
@@ -3065 +3065 @@
 //  -3  : "File not open"
 /////////////////////////////////////////////////////////////////////////////////
-int _fat_file_info( unsigned int   fd_id,
-                    unsigned int*  size,
-                    unsigned int*  offset )
-{
-    // checking FAT initialised
-    if( _fat.initialised != FAT_INITIALISED )
+int _fat_file_info( unsigned int            fd_id,
+                    struct fat_file_info_s* info )
+{
+    if ( _fat.initialised != FAT_INITIALISED )
     {
         _printf("\n[FAT ERROR] in _fat_file_info() : FAT not initialised\n");
@@ -3076 +3074 @@
     }
 
-
-    if( fd_id >= GIET_OPEN_FILES_MAX )
+    if ( fd_id >= GIET_OPEN_FILES_MAX )
     {
         _printf("\n[FAT ERROR] in _fat_file_info() : illegal file descriptor index\n");
@@ -3090 +3087 @@
     }
 
-    *size   = _fat.fd[fd_id].inode->size;
-    *offset = _fat.fd[fd_id].seek;  
+    info->size   = _fat.fd[fd_id].inode->size;
+    info->offset = _fat.fd[fd_id].seek;
+    info->is_dir = _fat.fd[fd_id].inode->is_dir;
+
     return 0;
-
 } // end _fat_file_info()
 

soft/giet_vm/giet_fat32/fat32.h

@@ -124 +124 @@
 /*******************************************************************************/
 
+#define FAT_INITIALISED         0xBABEF00D
+
+#ifndef _FAT32_SHARED
+#define _FAT32_SHARED
+typedef struct fat_file_info_s
+{
+    unsigned int size;
+    unsigned int offset;
+    unsigned int is_dir;
+}   fat_file_info_t;
 
 #define SEEK_SET                0
 #define SEEK_CUR                1
 
-#define FAT_INITIALISED         0xBABEF00D
-
 #define O_RDONLY                0x01
 #define O_CREATE                0x20
+#endif // _FAT32_SHARED
 
 /********************************************************************************
@@ -227 +236 @@
 extern int _fat_close( unsigned int fd_id );               // file descriptor
 
-extern int _fat_file_info( unsigned int  fd_id,            // file descriptor 
-                           unsigned int* size,             // file size
-                           unsigned int* offset );         // current offset 
+extern int _fat_file_info( unsigned int            fd_id,  // file descriptor
+                           struct fat_file_info_s* info ); // file info struct
 
 extern int _fat_read( unsigned int fd_id,                  // file descriptor