Changeset 798 for soft/giet_vm/giet_fat32

Timestamp:

Mar 2, 2016, 3:08:27 PM (9 years ago)

Author:

meunier

Message:

• Bug fixes in Rosenfeld

File:

• soft/giet_vm/giet_fat32/fat32.c (modified) (7 diffs)

soft/giet_vm/giet_fat32/fat32.c

@@ -565 +565 @@
 
 /////////////////////////////////////////////////////////////////
-static inline unsigned int _get_fat_entry( unsigned int  cluster,
+static unsigned int _get_fat_entry( unsigned int  cluster,
                                            unsigned int* value )
 {
@@ -2440 +2440 @@
 
 #if GIET_DEBUG_FAT
-unsigned int procid  = _get_procid();
-unsigned int x       = procid >> (Y_WIDTH + P_WIDTH);
-unsigned int y       = (procid >> P_WIDTH) & ((1<<Y_WIDTH)-1);
-unsigned int p       = procid & ((1<<P_WIDTH)-1);
-if ( _get_proctime() > GIET_DEBUG_FAT )
-_printf("\n[DEBUG FAT] _fat_open(): P[%d,%d,%d] enters for path <%s>\n"
-        " create = %d / read_only = %d / truncate = %d\n",
-        x, y, p, pathname , create , read_only , truncate );
+    unsigned int procid  = _get_procid();
+    unsigned int x       = procid >> (Y_WIDTH + P_WIDTH);
+    unsigned int y       = (procid >> P_WIDTH) & ((1 << Y_WIDTH) - 1);
+    unsigned int p       = procid & ((1 << P_WIDTH) - 1);
+    if ( _get_proctime() > GIET_DEBUG_FAT )
+        _printf("\n[DEBUG FAT] _fat_open(): P[%d,%d,%d] enters for path <%s>\n"
+                " create = %d / read_only = %d / truncate = %d\n",
+                x, y, p, pathname , create , read_only , truncate );
 #endif
 
     // checking FAT initialized
-    if( _fat.initialized != FAT_INITIALIZED )
+    if ( _fat.initialized != FAT_INITIALIZED )
     {
         _printf("\n[FAT ERROR] _fat_open(): FAT not initialized\n");
@@ -2499 +2499 @@
 
 #if GIET_DEBUG_FAT
-if ( _get_proctime() > GIET_DEBUG_FAT )
-_printf("\n[DEBUG FAT] _fat_open(): P[%d,%d,%d] create a new file <%s>\n",
-        x , y , p , pathname );
+        if ( _get_proctime() > GIET_DEBUG_FAT )
+            _printf("\n[DEBUG FAT] _fat_open(): P[%d,%d,%d] create a new file <%s>\n",
+                    x , y , p , pathname );
 #endif
 
@@ -2562 +2562 @@
 
 #if GIET_DEBUG_FAT
-if ( _get_proctime() > GIET_DEBUG_FAT )
-{
-    _printf("\n[DEBUG FAT] _fat_open() : new inode created for <%s>\n" 
-            " size = %x / cluster = %x / cache = %x",
-            child->name , child->size , child->cluster , child->cache );
-    if ( child->cache != NULL )
-    {
-         _printf(" / pdesc[0] = %x\n", (unsigned int)(child->cache->children[0]) );
-    }
-    else
-    {
-         _printf("\n");
-    }
-}
+        if ( _get_proctime() > GIET_DEBUG_FAT )
+        {
+            _printf("\n[DEBUG FAT] _fat_open() : new inode created for <%s>\n" 
+                    " size = %x / cluster = %x / cache = %x",
+                    child->name , child->size , child->cluster , child->cache );
+            if ( child->cache != NULL )
+            {
+                _printf(" / pdesc[0] = %x\n", (unsigned int)(child->cache->children[0]) );
+            }
+            else
+            {
+                _printf("\n");
+            }
+        }
 #endif
 
@@ -2585 +2585 @@
 
 #if GIET_DEBUG_FAT
-if ( _get_proctime() > GIET_DEBUG_FAT )
-{
-    _printf("\n[DEBUG FAT] _fat_open(): P[%d,%d,%d] found file <%s>\n"
-            " inode = %x / size = %x\n",
-            x , y , p , pathname , (unsigned int)child , child->size );
-
-    _display_clusters_list( child );
-}
+        if ( _get_proctime() > GIET_DEBUG_FAT )
+        {
+            _printf("\n[DEBUG FAT] _fat_open(): P[%d,%d,%d] found file <%s>\n"
+                    " inode = %x / size = %x\n",
+                    x , y , p , pathname , (unsigned int)child , child->size );
+
+            _display_clusters_list( child );
+        }
 #endif
 
@@ -2624 +2624 @@
 
     // truncate the file if requested
-    if ( truncate && !read_only && !child->is_dir )
+    if ( truncate && !read_only && !child->is_dir && child->size != 0 )
     {
         // empty file
@@ -2655 +2655 @@
 
 #if GIET_DEBUG_FAT
-if ( _get_proctime() > GIET_DEBUG_FAT )
-_printf("\n[DEBUG FAT] _fat_open(): P[%d,%d,%d] get fd = %d for <%s>\n"
-        " inode = %x / offset = %x / read_only = %d / size = %x / cluster = %x\n",
-        x , y , p , fd_id , pathname , 
-        (unsigned int)_fat.fd[fd_id].inode,
-        _fat.fd[fd_id].seek,
-        _fat.fd[fd_id].read_only,
-        _fat.fd[fd_id].inode->size,
-        _fat.fd[fd_id].inode->cluster );
+    if ( _get_proctime() > GIET_DEBUG_FAT )
+        _printf("\n[DEBUG FAT] _fat_open(): P[%d,%d,%d] get fd = %d for <%s>\n"
+                " inode = %x / offset = %x / read_only = %d / size = %x / cluster = %x\n",
+                x , y , p , fd_id , pathname , 
+                (unsigned int)_fat.fd[fd_id].inode,
+                _fat.fd[fd_id].seek,
+                _fat.fd[fd_id].read_only,
+                _fat.fd[fd_id].inode->size,
+                _fat.fd[fd_id].inode->cluster );
 #endif