Changeset 925a21e in mainline for uspace/app/ext2info/ext2info.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/ext2info/ext2info.c (modified) (4 diffs)

uspace/app/ext2info/ext2info.c

@@ -42 +42 @@
 #include <libblock.h>
 #include <mem.h>
-#include <devmap.h>
+#include <loc.h>
 #include <byteorder.h>
 #include <sys/types.h>
@@ -81 +81 @@
         char *endptr;
         char *dev_path;
-        devmap_handle_t handle;
+        service_id_t service_id;
         ext2_filesystem_t filesystem;
         int arg_flags;
@@ -178 +178 @@
         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);
@@ -184 +184 @@
         }
 
-        rc = ext2_filesystem_init(&filesystem, handle);
+        rc = ext2_filesystem_init(&filesystem, service_id);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libext2.\n");