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

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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) (4 diffs)

uspace/srv/bd/rd/rd.c

@@ -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),
@@ -243 +246 @@
                 return false;
         }
-
+        
         fibril_rwlock_initialize(&rd_lock);
         
@@ -258 +261 @@
         printf("%s: Accepting connections\n", NAME);
         async_manager();
-
+        
         /* Never reached */
         return 0;