Changeset 973ef9fc in mainline for uspace/srv/net/net/net.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/net/net/net.c (modified) (4 diffs)

uspace/srv/net/net/net.c

@@ -322 +322 @@
 static int net_module_start(async_client_conn_t client_connection)
 {
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
         int rc;
         
@@ -335 +335 @@
                 goto out;
         
-        rc = REGISTER_ME(SERVICE_NETWORKING, &phonehash);
+        rc = ipc_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, &phonehash);
         if (rc != EOK)
                 goto out;
@@ -632 +632 @@
         
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -697 +697 @@
                 
                 /* End if told to either by the message or the processing result */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
                         return;