Changeset 925a21e in mainline for uspace/app/blkdump/blkdump.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/blkdump/blkdump.c (modified) (9 diffs)

uspace/app/blkdump/blkdump.c

@@ -42 +42 @@
 #include <libblock.h>
 #include <mem.h>
-#include <devmap.h>
+#include <loc.h>
 #include <byteorder.h>
 #include <sys/types.h>
@@ -59 +59 @@
         int rc;
         char *dev_path;
-        devmap_handle_t handle;
+        service_id_t service_id;
         size_t block_size;
         char *endptr;
@@ -128 +128 @@
         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);
@@ -134 +134 @@
         }
 
-        rc = block_init(EXCHANGE_SERIALIZE, handle, 2048);
+        rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libblock.\n");
@@ -140 +140 @@
         }
 
-        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");
@@ -146 +146 @@
         }
 
-        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");
@@ -156 +156 @@
         if (data == NULL) {
                 printf(NAME ": Error allocating data buffer of %" PRIuOFF64 " bytes", (aoff64_t) block_size);
-                block_fini(handle);
+                block_fini(service_id);
                 return 3;
         }
@@ -162 +162 @@
         limit = block_offset + block_count;
         for (current = block_offset; current < limit; current++) {
-                rc = block_read_direct(handle, current, 1, data);
+                rc = block_read_direct(service_id, current, 1, data);
                 if (rc != EOK) {
                         printf(NAME ": Error reading block at %" PRIuOFF64 " \n", current);
@@ -186 +186 @@
         free(data);
 
-        block_fini(handle);
+        block_fini(service_id);
 
         return 0;