Changeset c56c4576 in mainline for uspace/srv/fs/exfat/exfat_directory.c

Timestamp:

2011-08-18T18:09:11Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7234617

Parents:

602c3d8c

Message:

exFAT: fixes to support big endian. Tested on mips32 EB

File:

• uspace/srv/fs/exfat/exfat_directory.c (modified) (8 diffs)

uspace/srv/fs/exfat/exfat_directory.c

@@ -283 +283 @@
                 if (rc != EOK)
                         return rc;
-                memcpy((uint8_t *)&array[i], (uint8_t *)de, sizeof(exfat_dentry_t));
+                array[i] = *de;
                 rc = exfat_directory_next(di);
                 if (rc!=EOK) {
@@ -297 +297 @@
 
         /* Sync */
-        array[0].file.attr = df->attr;
-        array[1].stream.firstc = ds->firstc;
+        array[0].file.attr = host2uint16_t_le(df->attr);
+        array[1].stream.firstc = host2uint32_t_le(ds->firstc);
         array[1].stream.flags = ds->flags;
-        array[1].stream.valid_data_size = ds->valid_data_size;
-        array[1].stream.data_size = ds->data_size;
+        array[1].stream.valid_data_size = host2uint64_t_le(ds->valid_data_size);
+        array[1].stream.data_size = host2uint64_t_le(ds->data_size);
         array[0].file.checksum = host2uint16_t_le(exfat_directory_set_checksum((uint8_t *)array,
             count*sizeof(exfat_dentry_t)));
@@ -310 +310 @@
                 if (rc != EOK)
                         return rc;
-                memcpy((uint8_t *)de, (uint8_t *)&array[i], sizeof(exfat_dentry_t));
+                *de = array[i];
                 di->b->dirty = true;
                 rc = exfat_directory_next(di);
@@ -318 +318 @@
                 }
         }
+        free(array);
 
         return EOK;
@@ -369 +370 @@
         uint16_t wname[EXFAT_FILENAME_LEN+1];
         int rc, i;
-        size_t uctable_chars;
+        size_t uctable_chars, j;
         aoff64_t pos;
 
@@ -420 +421 @@
         if (rc != EOK)
                 return rc;
-        memcpy(de, &df, sizeof(exfat_dentry_t));
+        *de = df;
         di->b->dirty = true;
         rc = exfat_directory_next(di);
@@ -430 +431 @@
         if (rc != EOK)
                 return rc;
-        memcpy(de, &ds, sizeof(exfat_dentry_t));
+        *de = ds;
         di->b->dirty = true;
 
@@ -451 +452 @@
                         return rc;
                 de->type = EXFAT_TYPE_NAME;
-                memcpy((uint8_t*)de->name.name, (uint8_t*)sname, sizeof(uint16_t)*chars);
+                /* test */
+                for (j=0; j<chars; j++){
+                        de->name.name[j] = *sname;
+                        sname++;
+                }
+
                 di->b->dirty = true;
                 sname += chars;