Changeset 15f3c3f in mainline for uspace/srv/bd/ata_bd

Timestamp:

2011-06-22T22:00:52Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

86ffa27f

Parents:

ef09a7a

Message:

Rename devmap to loc, devfs to locfs.

Location:

uspace/srv/bd/ata_bd

Files:

• ata_bd.c (modified) (5 diffs)
• ata_bd.h (modified) (1 diff)

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>
@@ -179 +179 @@
                 
                 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 +247 @@
         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 +280 @@
         ipc_call_t call;
         sysarg_t method;
-        devmap_handle_t dh;
+        service_id_t dsid;
         unsigned int flags;
         int retval;
@@ -287 +287 @@
         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;
 

uspace/srv/bd/ata_bd/ata_bd.h

@@ -116 +116 @@
 
         fibril_mutex_t lock;
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
 } disk_t;