Changeset b200230 in mainline

Timestamp:

2012-02-24T23:11:27Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

ba55c194

Parents:

3467821

Message:

mkexfat: Add some comments, code cleaning

File:

• uspace/app/mkexfat/mkexfat.c (modified) (7 diffs)

uspace/app/mkexfat/mkexfat.c

@@ -400 +400 @@
         assert(ncls > 0);
 
-        if (ncls == 1) {
-                fat[cur_cls] = host2uint32_t_le(0xFFFFFFFF);
-                rc = block_write_direct(service_id, fat_sec, 1, fat);
-                goto exit;
-        }
-
         for (; cur_cls < fat_entries && ncls > 1; ++cur_cls, --ncls)
                 fat[cur_cls] = host2uint32_t_le(cur_cls + 1);
 
         if (cur_cls == fat_entries) {
+                /* This sector is full, there are no more free entries,
+                 * read the next sector and restart the search.
+                 */
                 rc = block_write_direct(service_id, fat_sec++, 1, fat);
                 if (rc != EOK)
@@ -415 +412 @@
                 cur_cls = 0;
                 goto loop;
-        } else if (ncls == 1)
+        } else if (ncls == 1) {
+                /* This is the last cluster of this chain, mark it
+                 * with EOK.
+                 */
                 fat[cur_cls] = host2uint32_t_le(0xFFFFFFFF);
+        }
 
         rc = block_write_direct(service_id, fat_sec, 1, fat);
@@ -492 +493 @@
                 return ENOENT;
 
+        /* Compute the start sector of the upcase table */
         start_sec = cfg->data_start_sector;
         start_sec += ((cfg->upcase_table_cluster - 2) * cfg->cluster_size) /
             cfg->sector_size;
 
+        /* Compute the number of sectors needed to store the table on disk */
         nsecs = div_round_up(sizeof(upcase_table), cfg->sector_size);
         table_ptr = (uint8_t *) upcase_table;
@@ -503 +506 @@
             table_size -= cfg->sector_size) {
 
-                if (table_size < cfg->sector_size)
+                if (table_size < cfg->sector_size) {
+                        /* Reset the content of the unused part
+                         * of the last sector.
+                         */
                         memset(buf, 0, cfg->sector_size);
+                }
                 memcpy(buf, table_ptr, min(table_size, cfg->sector_size));
 
@@ -621 +628 @@
         cfg_print_info(&cfg);
 
+        /* Initialize the FAT table */
         rc = fat_initialize(service_id, &cfg);
         if (rc != EOK) {
@@ -657 +665 @@
         }
 
+        /* Write the allocation bitmap to disk */
         rc = bitmap_write(service_id, &cfg);
         if (rc != EOK) {
@@ -664 +673 @@
         }
 
+        /* Write the upcase table to disk */
         rc = upcase_table_write(service_id, &cfg);
         if (rc != EOK) {