Changeset b0f00a9 in mainline for uspace/srv/bd/rd/rd.c

Timestamp:

2011-11-06T22:21:05Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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) (6 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>
@@ -84 +84 @@
  * @param icall Call data of the request that opened the connection.
  */
-static void rd_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void rd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         ipc_callid_t callid;
@@ -123 +123 @@
         while (true) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!IPC_GET_IMETHOD(call)) {
                         /*
                          * The other side has hung up.
-                         * Answer the message and exit the fibril.
+                         * Exit the fibril.
                          */
                         async_answer_0(callid, EOK);
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case BD_READ_BLOCKS:
                         ba = MERGE_LOUP32(IPC_GET_ARG1(call),
@@ -232 +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);
@@ -238 +241 @@
         }
         
-        devmap_handle_t devmap_handle;
-        if (devmap_device_register("bd/initrd", &devmap_handle) != EOK) {
-                printf("%s: Unable to register device\n", NAME);
-                return false;
-        }
-
+        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;
+        }
+        
         fibril_rwlock_initialize(&rd_lock);
         
@@ -258 +261 @@
         printf("%s: Accepting connections\n", NAME);
         async_manager();
-
+        
         /* Never reached */
         return 0;