Changeset 903bac0a in mainline for uspace/srv/bd/rd/rd.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/rd/rd.c (modified) (3 diffs)

uspace/srv/bd/rd/rd.c

@@ -52 +52 @@
 #include <fibril_synch.h>
 #include <stdio.h>
-#include <devmap.h>
+#include <loc.h>
 #include <ipc/bd.h>
 #include <macros.h>
@@ -235 +235 @@
             (void *) rd_ph_addr, rd_size);
         
-        int rc = devmap_driver_register(NAME, rd_connection);
+        int rc = loc_server_register(NAME, rd_connection);
         if (rc < 0) {
                 printf("%s: Unable to register driver (%d)\n", NAME, rc);
@@ -241 +241 @@
         }
         
-        devmap_handle_t devmap_handle;
-        if (devmap_device_register("bd/initrd", &devmap_handle) != EOK) {
-                printf("%s: Unable to register device\n", NAME);
+        service_id_t service_id;
+        if (loc_service_register("bd/initrd", &service_id) != EOK) {
+                printf("%s: Unable to register device service\n", NAME);
                 return false;
         }