Changeset c56c4576 in mainline

Timestamp:

2011-08-18T18:09:11Z (13 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

Location:

uspace/srv/fs/exfat

Files:

• exfat_directory.c (modified) (8 diffs)
• exfat_ops.c (modified) (6 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;

uspace/srv/fs/exfat/exfat_ops.c

@@ -125 +125 @@
                 df.attr = 0;
 
-        ds.firstc = host2uint32_t_le(node->firstc);
+        ds.firstc = node->firstc;
         if (node->size == 0 && node->firstc == 0) {
                 ds.flags = 0;
@@ -132 +132 @@
                 ds.flags |= (!node->fragmented << 1);
         }
-        ds.valid_data_size = host2uint64_t_le(node->size);
-        ds.data_size = host2uint64_t_le(node->size);
+        ds.valid_data_size = node->size;
+        ds.data_size = node->size;
 
         exfat_directory_open_parent(&di, node->idx->devmap_handle, node->idx->pfc, 
@@ -335 +335 @@
         switch (exfat_classify_dentry(d)) {
         case EXFAT_DENTRY_FILE:
-                nodep->type = (d->file.attr & EXFAT_ATTR_SUBDIR)? 
+                nodep->type = (uint16_t_le2host(d->file.attr) & EXFAT_ATTR_SUBDIR)? 
                     EXFAT_DIRECTORY : EXFAT_FILE;
                 rc = exfat_directory_next(&di);
@@ -349 +349 @@
                         return rc;
                 }
-                nodep->firstc = d->stream.firstc;
-                nodep->size = d->stream.data_size;
+                nodep->firstc = uint32_t_le2host(d->stream.firstc);
+                nodep->size = uint64_t_le2host(d->stream.data_size);
                 nodep->fragmented = (d->stream.flags & 0x02) == 0;
                 break;
         case EXFAT_DENTRY_BITMAP:
                 nodep->type = EXFAT_BITMAP;
-                nodep->firstc = d->bitmap.firstc;
-                nodep->size = d->bitmap.size;
+                nodep->firstc = uint32_t_le2host(d->bitmap.firstc);
+                nodep->size = uint64_t_le2host(d->bitmap.size);
                 nodep->fragmented = true;
                 break;
         case EXFAT_DENTRY_UCTABLE:
                 nodep->type = EXFAT_UCTABLE;
-                nodep->firstc = d->uctable.firstc;
-                nodep->size = d->uctable.size;
+                nodep->firstc = uint32_t_le2host(d->uctable.firstc);
+                nodep->size = uint64_t_le2host(d->uctable.size);
                 nodep->fragmented = true;
                 break;
@@ -1074 +1074 @@
 
         bitmapp->type = EXFAT_BITMAP;
-        bitmapp->firstc = de->bitmap.firstc;
+        bitmapp->firstc = uint32_t_le2host(de->bitmap.firstc);
         bitmapp->fragmented = true;
         bitmapp->idx->parent_fragmented = true;
         bitmapp->refcnt = 1;
         bitmapp->lnkcnt = 0;
-        bitmapp->size = de->bitmap.size;
+        bitmapp->size = uint64_t_le2host(de->bitmap.size);
 
         /* Initialize the uctable node. */
@@ -1116 +1116 @@
 
         uctablep->type = EXFAT_UCTABLE;
-        uctablep->firstc = de->uctable.firstc;
+        uctablep->firstc = uint32_t_le2host(de->uctable.firstc);
         uctablep->fragmented = true;
         uctablep->idx->parent_fragmented = true;
         uctablep->refcnt = 1;
         uctablep->lnkcnt = 0;
-        uctablep->size = de->uctable.size;
+        uctablep->size = uint64_t_le2host(de->uctable.size);
 
         rc = exfat_directory_close(&di);