Changeset 808 for soft/giet_vm/giet_fat32

Timestamp:

Mar 17, 2016, 2:18:30 PM (9 years ago)

Author:

alain

Message:

Introduce the O_WRONLY and O_RDWR flags for the giet_fat_open system call.

Location:

soft/giet_vm/giet_fat32

Files:

• fat32.c (modified) (4 diffs)
• fat32.h (modified) (1 diff)
• fat32_shared.h (modified) (2 diffs)

soft/giet_vm/giet_fat32/fat32.c

@@ -2409 +2409 @@
     
     // get flags
-    unsigned int create    = ((flags & O_CREAT)  != 0);
-    unsigned int read_only = ((flags & O_RDONLY) != 0);
-    unsigned int truncate  = ((flags & O_TRUNC)  != 0);
-    unsigned int append    = ((flags & O_APPEND) != 0);
+    unsigned int create     = ((flags & O_CREAT)  != 0);
+    unsigned int read_only  = ((flags & O_RDONLY) != 0);
+    unsigned int write_only = ((flags & O_WRONLY) != 0);
+    unsigned int truncate   = ((flags & O_TRUNC)  != 0);
+    unsigned int append     = ((flags & O_APPEND) != 0);
 
 #if GIET_DEBUG_FAT
@@ -2623 +2624 @@
     _fat.fd[fd_id].allocated  = 1;
     _fat.fd[fd_id].read_only  = read_only;
+    _fat.fd[fd_id].write_only = write_only;
     _fat.fd[fd_id].inode      = child;
     _fat.fd[fd_id].seek       = ( append ) ? child->size : 0;
@@ -2821 +2823 @@
     }
 
-    // check fd_id overflow
-    if ( fd_id >= GIET_OPEN_FILES_MAX )
-    {
-        _printf("\n[FAT ERROR] in _fat_read(): illegal file descriptor\n");
-        return GIET_FAT32_INVALID_FD;
-    }
-
-    // check file open
-    if ( _fat.fd[fd_id].allocated == 0 )
-    {
-        _printf("\n[FAT ERROR] in _fat_read(): file not open\n");
-        return GIET_FAT32_NOT_OPEN;
-    }
-
     // takes the FAT lock and register it in thread context
     static_scheduler_t*  psched = _get_sched();
@@ -2841 +2829 @@
     _atomic_or( &psched->context[ltid].slot[CTX_LOCKS_ID] , LOCKS_MASK_FAT ); 
            
+    // check fd_id overflow
+    if ( fd_id >= GIET_OPEN_FILES_MAX )
+    {
+        _spin_lock_release( &_fat.fat_lock );
+        _atomic_and( &psched->context[ltid].slot[CTX_LOCKS_ID] , ~LOCKS_MASK_FAT ); 
+
+        _printf("\n[FAT ERROR] in _fat_read(): illegal file descriptor\n");
+        return GIET_FAT32_INVALID_FD;
+    }
+
+    // check file open
+    if ( _fat.fd[fd_id].allocated == 0 )
+    {
+        _spin_lock_release( &_fat.fat_lock );
+        _atomic_and( &psched->context[ltid].slot[CTX_LOCKS_ID] , ~LOCKS_MASK_FAT ); 
+
+        _printf("\n[FAT ERROR] in _fat_read(): file not open\n");
+        return GIET_FAT32_NOT_OPEN;
+    }
+
+    // check file readable
+    if ( _fat.fd[fd_id].write_only )
+    {
+        _spin_lock_release( &_fat.fat_lock );
+        _atomic_and( &psched->context[ltid].slot[CTX_LOCKS_ID] , ~LOCKS_MASK_FAT ); 
+
+        _printf("\n[FAT ERROR] _fat_read(): file <%s> is write-only\n",
+                _fat.fd[fd_id].inode->name );
+        return GIET_FAT32_WRITE_ONLY;
+    }
+
     // get special modes
     unsigned int physical_addressing = modes & FAT_PADDR_MODE;

soft/giet_vm/giet_fat32/fat32.h

@@ -186 +186 @@
     char                 allocated;              // file descriptor allocated
     char                 read_only;              // write protected
-    char                 reserved[6];            // reserved
+    char                 write_only;             // read protected
+    char                 reserved[5];            // reserved
 }   fat_file_desc_t;
 

soft/giet_vm/giet_fat32/fat32_shared.h

@@ -37 +37 @@
 
 #define O_RDONLY                0x01
+#define O_WRONLY                0x02
+#define O_RDWR                  0x00
 #define O_TRUNC                 0x10
 #define O_CREAT                 0x20
@@ -83 +85 @@
 #define GIET_FAT32_NO_MORE_ENTRIES      (-18)
 #define GIET_FAT32_BUFFER_TOO_SMALL     (-19)
+#define GIET_FAT32_WRITE_ONLY           (-20)
 
 #endif // _FAT32_SHARED