Changeset 0a51029f in mainline

Timestamp:

2011-05-01T07:02:34Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

b5db2ae

Parents:

aa2ea13

Message:

Implemented readonly access to FAT32 file system
Support reading root directory, subdirs and files.

Location:

uspace/srv/fs/fat

Files:

• fat_fat.c (modified) (4 diffs)
• fat_ops.c (modified) (1 diff)

uspace/srv/fs/fat/fat_fat.c

@@ -474 +474 @@
         int rc;
 
-        for (fatno = FAT1 + 1; fatno < bs->fatcnt; fatno++) {
+        for (fatno = FAT1 + 1; fatno < FATCNT(bs); fatno++) {
                 for (c = 0; c < nclsts; c++) {
                         rc = fat_set_cluster(bs, devmap_handle, fatno, lifo[c],
@@ -584 +584 @@
                 if (rc != EOK)
                         return rc;
-                for (fatno = FAT1; fatno < bs->fatcnt; fatno++) {
+                for (fatno = FAT1; fatno < FATCNT(bs); fatno++) {
                         rc = fat_set_cluster(bs, devmap_handle, fatno, firstc,
                             FAT_CLST_RES0);
@@ -630 +630 @@
                 }
 
-                for (fatno = FAT1; fatno < bs->fatcnt; fatno++) {
+                for (fatno = FAT1; fatno < FATCNT(bs); fatno++) {
                         rc = fat_set_cluster(bs, nodep->idx->devmap_handle,
                             fatno, lastc, mcl);
@@ -683 +683 @@
 
                 /* Terminate the cluster chain in all copies of FAT. */
-                for (fatno = FAT1; fatno < bs->fatcnt; fatno++) {
+                for (fatno = FAT1; fatno < FATCNT(bs); fatno++) {
                         rc = fat_set_cluster(bs, devmap_handle, fatno, lcl,
                             clst_last1);

uspace/srv/fs/fat/fat_ops.c

@@ -1055 +1055 @@
 
         rootp->type = FAT_DIRECTORY;
-        rootp->firstc = FAT_CLST_ROOT;
+        rootp->firstc = (FAT_IS_FAT32(bs) ? bs->fat32.root_cluster : FAT_CLST_ROOT);
         rootp->refcnt = 1;
         rootp->lnkcnt = 0;      /* FS root is not linked */
-        rootp->size = RDE(bs) * sizeof(fat_dentry_t);
+        rootp->size = (FAT_IS_FAT32(bs) ? SPC(bs)*BPS(bs) : 
+            RDE(bs) * sizeof(fat_dentry_t));
         rootp->idx = ridxp;
         ridxp->nodep = rootp;