Changeset bd5f3b7 in mainline for uspace/srv/bd/ata_bd/ata_bd.c

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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/ata_bd/ata_bd.c (modified) (6 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -57 +57 @@
 #include <stdint.h>
 #include <str.h>
-#include <devmap.h>
+#include <loc.h>
 #include <sys/types.h>
 #include <inttypes.h>
@@ -80 +80 @@
  */
 static const size_t identify_data_size = 512;
-
-/** Size of the communication area. */
-static size_t comm_size;
 
 /** I/O base address of the command registers. */
@@ -179 +176 @@
                 
                 snprintf(name, 16, "%s/ata%udisk%d", NAMESPACE, ctl_num, i);
-                rc = devmap_device_register(name, &disk[i].devmap_handle);
+                rc = loc_service_register(name, &disk[i].service_id);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s.\n", name);
@@ -247 +244 @@
         int rc;
 
-        rc = devmap_driver_register(NAME, ata_bd_connection);
+        rc = loc_server_register(NAME, ata_bd_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");
@@ -280 +277 @@
         ipc_call_t call;
         sysarg_t method;
-        devmap_handle_t dh;
+        service_id_t dsid;
+        size_t comm_size;       /**< Size of the communication area. */
         unsigned int flags;
         int retval;
@@ -287 +285 @@
         int disk_id, i;
 
-        /* Get the device handle. */
-        dh = IPC_GET_ARG1(*icall);
+        /* Get the device service ID. */
+        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 (disk[i].devmap_handle == dh)
+                if (disk[i].service_id == dsid)
                         disk_id = i;