Changeset 0182e5cc in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2011-05-24T19:56: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:

a1467102

Parents:

88a27f1

Message:

1. Rewrite and clean fat_get_cluster_fat12
2. Support MIPS and other arch with only alligned memory access.
3. Fix incompatibilities with BigEndian.
4. Tested on IA32 and on MIPS32 EndianBig (GXEmul):

FAT12,16 reading and writing. FAT32 only reading. FAT32 writing - not tested!

5. Some fixes for FAT32: reading hi and lo part of node cluster number from fat_dentry_t,

but its need more fixes to change size of cluster number from uint16_t to uint32_t etc.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (4 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -310 +310 @@
 
         d = ((fat_dentry_t *)b->data) + (idxp->pdi % DPS(bs));
+        if (FAT_IS_FAT32(bs)) {
+                nodep->firstc = uint16_t_le2host(d->firstc_lo) | 
+                    (uint16_t_le2host(d->firstc_hi) << 16);
+        } 
+        else
+                nodep->firstc = uint16_t_le2host(d->firstc);
+
         if (d->attr & FAT_ATTR_SUBDIR) {
                 /*
@@ -318 +325 @@
                 nodep->type = FAT_DIRECTORY;
 
-                /*
+                /*
                  * Unfortunately, the 'size' field of the FAT dentry is not
                  * defined for the directory entry type. We must determine the
                  * size of the directory by walking the FAT.
                  */
+                /* TODO uint16_t clusters to uint32_t */
                 uint16_t clusters;
-                rc = fat_clusters_get(&clusters, bs, idxp->devmap_handle,
-                    uint16_t_le2host(d->firstc));
+                rc = fat_clusters_get(&clusters, bs, idxp->devmap_handle, nodep->firstc);
                 if (rc != EOK) {
                         (void) block_put(b);
@@ -337 +344 @@
         }
 
-        nodep->firstc = uint16_t_le2host(d->firstc);
         nodep->lnkcnt = 1;
         nodep->refcnt = 1;
@@ -1029 +1035 @@
                 return;
         }
+
         fs_node_initialize(rfn);
         fat_node_t *rootp = (fat_node_t *)malloc(sizeof(fat_node_t));