Changeset e285656 in mainline for uspace/srv/fs/exfat/exfat_fat.c

Timestamp:

2011-12-14T20:45:49Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0cfb05e

Parents:

d6d15ec (diff), 9916841 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

File:

• uspace/srv/fs/exfat/exfat_fat.c (modified) (5 diffs)

uspace/srv/fs/exfat/exfat_fat.c

@@ -50 +50 @@
 #include <malloc.h>
 #include <mem.h>
+#include <str.h>
 
 
@@ -322 +323 @@
                             (found == 0) ?  EXFAT_CLST_EOF : lifo[found - 1]);
                         if (rc != EOK)
-                                break;
+                                goto exit_error;
                         found++;
                         rc = bitmap_set_cluster(bs, service_id, clst);
                         if (rc != EOK)
-                                break;
+                                goto exit_error;
 
                 }
@@ -339 +340 @@
         }
 
+        rc = ENOSPC;
+
+exit_error:
+
         /* If something wrong - free the clusters */
         while (found--) {
@@ -347 +352 @@
         free(lifo);
         fibril_mutex_unlock(&exfat_alloc_lock);
-        return ENOSPC;
+        return rc;
 }
 
@@ -537 +542 @@
 int exfat_sanity_check(exfat_bs_t *bs, service_id_t service_id)
 {
-        /* TODO */
+        if (str_cmp((char const *)bs->oem_name, "EXFAT   "))
+                return ENOTSUP;
+        else if (uint16_t_le2host(bs->signature) != 0xAA55)
+                return ENOTSUP;
+        else if (uint32_t_le2host(bs->fat_sector_count) == 0)
+                return ENOTSUP;
+        else if (uint32_t_le2host(bs->data_clusters) == 0)
+                return ENOTSUP;
+        else if (bs->fat_count != 1)
+                return ENOTSUP;
+        else if ((bs->bytes_per_sector + bs->sec_per_cluster) > 25) {
+                /* exFAT does not support cluster size > 32 Mb */
+                return ENOTSUP;
+        }
         return EOK;
 }