Changeset 26e7d6d in mainline for uspace/srv/bd/gxe_bd/gxe_bd.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/srv/bd/gxe_bd/gxe_bd.c (modified) (6 diffs)

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -43 +43 @@
 #include <as.h>
 #include <fibril_synch.h>
-#include <devmap.h>
+#include <loc.h>
 #include <sys/types.h>
 #include <errno.h>
@@ -92 +92 @@
 static gxe_bd_t *dev;
 
-static devmap_handle_t devmap_handle[MAX_DISKS];
+static service_id_t service_id[MAX_DISKS];
 
 static fibril_mutex_t dev_lock[MAX_DISKS];
@@ -126 +126 @@
         char name[16];
 
-        rc = devmap_driver_register(NAME, gxe_bd_connection);
+        rc = loc_server_register(NAME, gxe_bd_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");
@@ -142 +142 @@
         for (i = 0; i < MAX_DISKS; i++) {
                 snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
-                rc = devmap_device_register(name, &devmap_handle[i]);
+                rc = loc_service_register(name, &service_id[i]);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s.\n", name);
@@ -159 +159 @@
         ipc_call_t call;
         sysarg_t method;
-        devmap_handle_t dh;
+        service_id_t dsid;
         unsigned int flags;
         int retval;
@@ -167 +167 @@
 
         /* Get the device handle. */
-        dh = IPC_GET_ARG1(*icall);
+        dsid = IPC_GET_ARG1(*icall);
 
         /* Determine which disk device is the client connecting to. */
         disk_id = -1;
         for (i = 0; i < MAX_DISKS; i++)
-                if (devmap_handle[i] == dh)
+                if (service_id[i] == dsid)
                         disk_id = i;