Changeset 46c20c8 in mainline for uspace/app/mkfat/mkfat.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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:

Merge mainline changes.

File:

• uspace/app/mkfat/mkfat.c (modified) (4 diffs)

uspace/app/mkfat/mkfat.c

@@ -85 +85 @@
     struct fat_params *par);
 static int fat_blocks_write(struct fat_params const *par,
-    dev_handle_t handle);
+    devmap_handle_t handle);
 static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs);
 
@@ -95 +95 @@
         int rc;
         char *dev_path;
-        dev_handle_t handle;
+        devmap_handle_t handle;
         size_t block_size;
         char *endptr;
-        bn_t dev_nblocks;
+        aoff64_t dev_nblocks;
 
         cfg.total_sectors = 0;
@@ -160 +160 @@
                 printf(NAME ": Warning, failed to obtain block device size.\n");
         } else {
-                printf(NAME ": Block device has %" PRIuBN " blocks.\n",
+                printf(NAME ": Block device has %" PRIuOFF64 " blocks.\n",
                     dev_nblocks);
                 cfg.total_sectors = dev_nblocks;
@@ -234 +234 @@
 
 /** Create file system with the given parameters. */
-static int fat_blocks_write(struct fat_params const *par, dev_handle_t handle)
-{
-        bn_t addr;
+static int fat_blocks_write(struct fat_params const *par, devmap_handle_t handle)
+{
+        aoff64_t addr;
         uint8_t *buffer;
         int i;