Changeset 26e7d6d in mainline for uspace/app/bdsh/cmds/modules/bdd/bdd.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/bdsh/cmds/modules/bdd/bdd.c (modified) (8 diffs)

uspace/app/bdsh/cmds/modules/bdd/bdd.c

@@ -39 +39 @@
 
 #include <libblock.h>
-#include <devmap.h>
+#include <loc.h>
 #include <errno.h>
 #include <assert.h>
@@ -69 +69 @@
         unsigned int argc;
         unsigned int i, j;
-        devmap_handle_t handle;
+        service_id_t service_id;
         aoff64_t offset;
         uint8_t *blk;
@@ -96 +96 @@
                 size = 256;
 
-        rc = devmap_device_get_handle(argv[1], &handle, 0);
+        rc = loc_service_get_id(argv[1], &service_id, 0);
         if (rc != EOK) {
                 printf("%s: Error resolving device `%s'.\n", cmdname, argv[1]);
@@ -102 +102 @@
         }
 
-        rc = block_init(EXCHANGE_SERIALIZE, handle, 2048);
+        rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
         if (rc != EOK)  {
                 printf("%s: Error initializing libblock.\n", cmdname);
@@ -108 +108 @@
         }
 
-        rc = block_get_bsize(handle, &block_size);
+        rc = block_get_bsize(service_id, &block_size);
         if (rc != EOK) {
                 printf("%s: Error determining device block size.\n", cmdname);
@@ -117 +117 @@
         if (blk == NULL) {
                 printf("%s: Error allocating memory.\n", cmdname);
-                block_fini(handle);
+                block_fini(service_id);
                 return CMD_FAILURE;
         }
@@ -124 +124 @@
 
         while (size > 0) {
-                rc = block_read_direct(handle, ba, 1, blk);
+                rc = block_read_direct(service_id, ba, 1, blk);
                 if (rc != EOK) {
                         printf("%s: Error reading block %" PRIuOFF64 "\n", cmdname, ba);
                         free(blk);
-                        block_fini(handle);
+                        block_fini(service_id);
                         return CMD_FAILURE;
                 }
@@ -170 +170 @@
 
         free(blk);
-        block_fini(handle);
+        block_fini(service_id);
 
         return CMD_SUCCESS;