Changeset bd5f3b7 in mainline for uspace/app/mkfat/mkfat.c

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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) (14 diffs)

uspace/app/mkfat/mkfat.c

@@ -42 +42 @@
 #include <libblock.h>
 #include <mem.h>
-#include <devmap.h>
+#include <loc.h>
 #include <byteorder.h>
 #include <sys/types.h>
@@ -85 +85 @@
     struct fat_params *par);
 static int fat_blocks_write(struct fat_params const *par,
-    devmap_handle_t handle);
+    service_id_t service_id);
 static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs);
 
@@ -95 +95 @@
         int rc;
         char *dev_path;
-        devmap_handle_t handle;
+        service_id_t service_id;
         size_t block_size;
         char *endptr;
@@ -138 +138 @@
         dev_path = *argv;
 
-        rc = devmap_device_get_handle(dev_path, &handle, 0);
+        rc = loc_service_get_id(dev_path, &service_id, 0);
         if (rc != EOK) {
                 printf(NAME ": Error resolving device `%s'.\n", dev_path);
@@ -144 +144 @@
         }
 
-        rc = block_init(EXCHANGE_SERIALIZE, handle, 2048);
+        rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libblock.\n");
@@ -150 +150 @@
         }
 
-        rc = block_get_bsize(handle, &block_size);
+        rc = block_get_bsize(service_id, &block_size);
         if (rc != EOK) {
                 printf(NAME ": Error determining device block size.\n");
@@ -156 +156 @@
         }
 
-        rc = block_get_nblocks(handle, &dev_nblocks);
+        rc = block_get_nblocks(service_id, &dev_nblocks);
         if (rc != EOK) {
                 printf(NAME ": Warning, failed to obtain block device size.\n");
@@ -183 +183 @@
         }
 
-        rc = fat_blocks_write(&par, handle);
+        rc = fat_blocks_write(&par, service_id);
         if (rc != EOK) {
                 printf(NAME ": Error writing device.\n");
@@ -189 +189 @@
         }
 
-        block_fini(handle);
+        block_fini(service_id);
         printf("Success.\n");
 
@@ -234 +234 @@
 
 /** Create file system with the given parameters. */
-static int fat_blocks_write(struct fat_params const *par, devmap_handle_t handle)
+static int fat_blocks_write(struct fat_params const *par, service_id_t service_id)
 {
         aoff64_t addr;
@@ -245 +245 @@
         fat_bootsec_create(par, &bs);
 
-        rc = block_write_direct(handle, BS_BLOCK, 1, &bs);
+        rc = block_write_direct(service_id, BS_BLOCK, 1, &bs);
         if (rc != EOK)
                 return EIO;
@@ -257 +257 @@
         /* Reserved sectors */
         for (i = 0; i < par->reserved_sectors - 1; ++i) {
-                rc = block_write_direct(handle, addr, 1, buffer);
+                rc = block_write_direct(service_id, addr, 1, buffer);
                 if (rc != EOK)
                         return EIO;
@@ -277 +277 @@
                         }
 
-                        rc = block_write_direct(handle, addr, 1, buffer);
+                        rc = block_write_direct(service_id, addr, 1, buffer);
                         if (rc != EOK)
                                 return EIO;
@@ -291 +291 @@
         /* Root directory */
         for (i = 0; i < par->rootdir_sectors; ++i) {
-                rc = block_write_direct(handle, addr, 1, buffer);
+                rc = block_write_direct(service_id, addr, 1, buffer);
                 if (rc != EOK)
                         return EIO;