Changeset 903bac0a in mainline for uspace/srv/bd/part/guid_part/guid_part.c

Timestamp:

2011-08-19T09:00:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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/srv/bd/part/guid_part/guid_part.c (modified) (16 diffs)

uspace/srv/bd/part/guid_part/guid_part.c

@@ -51 +51 @@
 #include <as.h>
 #include <fibril_synch.h>
-#include <devmap.h>
+#include <loc.h>
 #include <sys/types.h>
 #include <sys/typefmt.h>
 #include <inttypes.h>
 #include <libblock.h>
-#include <devmap.h>
+#include <loc.h>
 #include <errno.h>
 #include <bool.h>
@@ -81 +81 @@
         /** Number of blocks */
         aoff64_t length;
-        /** Device representing the partition (outbound device) */
-        devmap_handle_t dev;
+        /** Service representing the partition (outbound device) */
+        service_id_t dsid;
         /** Points to next partition structure. */
         struct part *next;
@@ -90 +90 @@
 
 /** Partitioned device (inbound device) */
-static devmap_handle_t indev_handle;
+static service_id_t indev_sid;
 
 /** List of partitions. This structure is an empty head. */
@@ -129 +129 @@
         int i;
         char *name;
-        devmap_handle_t dev;
+        service_id_t dsid;
         uint64_t size_mb;
         part_t *part;
 
-        rc = devmap_device_get_handle(dev_name, &indev_handle, 0);
+        rc = loc_service_get_id(dev_name, &indev_sid, 0);
         if (rc != EOK) {
                 printf(NAME ": could not resolve device `%s'.\n", dev_name);
@@ -139 +139 @@
         }
 
-        rc = block_init(EXCHANGE_SERIALIZE, indev_handle, 2048);
+        rc = block_init(EXCHANGE_SERIALIZE, indev_sid, 2048);
         if (rc != EOK)  {
                 printf(NAME ": could not init libblock.\n");
@@ -147 +147 @@
         /* Determine and verify block size. */
 
-        rc = block_get_bsize(indev_handle, &block_size);
+        rc = block_get_bsize(indev_sid, &block_size);
         if (rc != EOK) {
                 printf(NAME ": error getting block size.\n");
@@ -163 +163 @@
                 return rc;
 
-        /* Register the driver with device mapper. */
-        rc = devmap_driver_register(NAME, gpt_connection);
+        /* Register server with location service. */
+        rc = loc_server_register(NAME, gpt_connection);
         if (rc != EOK) {
-                printf(NAME ": Unable to register driver.\n");
+                printf(NAME ": Unable to register server.\n");
                 return rc;
         }
@@ -188 +188 @@
                         return ENOMEM;
 
-                rc = devmap_device_register(name, &dev);
+                rc = loc_service_register(name, &dsid);
                 if (rc != EOK) {
-                        printf(NAME ": Unable to register device %s.\n", name);
+                        printf(NAME ": Unable to register service %s.\n", name);
                         return rc;
                 }
@@ -199 +199 @@
                     "%" PRIuOFF64 " MB.\n", name, part->length, size_mb);
 
-                part->dev = dev;
+                part->dsid = dsid;
                 free(name);
 
@@ -228 +228 @@
         }
 
-        rc = block_read_direct(indev_handle, GPT_HDR_BA, 1, gpt_hdr);
+        rc = block_read_direct(indev_sid, GPT_HDR_BA, 1, gpt_hdr);
         if (rc != EOK) {
                 printf(NAME ": Failed reading GPT header block.\n");
@@ -256 +256 @@
         }
 
-        rc = block_read_direct(indev_handle, ba, bcnt, etable);
+        rc = block_read_direct(indev_sid, ba, bcnt, etable);
         if (rc != EOK) {
                 printf(NAME ": Failed reading GPT entries.\n");
@@ -303 +303 @@
         }
 
-        part->dev = 0;
+        part->dsid = 0;
         part->next = NULL;
 }
@@ -314 +314 @@
         ipc_call_t call;
         sysarg_t method;
-        devmap_handle_t dh;
+        service_id_t dh;
         unsigned int flags;
         int retval;
@@ -330 +330 @@
          */
         part = plist_head.next;
-        while (part != NULL && part->dev != dh)
+        while (part != NULL && part->dsid != dh)
                 part = part->next;
 
@@ -410 +410 @@
                 return ELIMIT;
 
-        return block_read_direct(indev_handle, gba, cnt, buf);
+        return block_read_direct(indev_sid, gba, cnt, buf);
 }
 
@@ -421 +421 @@
                 return ELIMIT;
 
-        return block_write_direct(indev_handle, gba, cnt, buf);
+        return block_write_direct(indev_sid, gba, cnt, buf);
 }