Changeset 973ef9fc in mainline for uspace/srv/net/netif/lo/lo.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/netif/lo/lo.c (modified) (3 diffs)

uspace/srv/net/netif/lo/lo.c

@@ -164 +164 @@
 int netif_initialize(void)
 {
-        ipcarg_t phonehash;
-
-        return REGISTER_ME(SERVICE_LO, &phonehash);
+        sysarg_t phonehash;
+
+        return ipc_connect_to_me(PHONE_NS, SERVICE_LO, 0, 0, &phonehash);
 }
 
@@ -185 +185 @@
 }
 
-int netif_send_message(device_id_t device_id, packet_t packet, services_t sender)
+int netif_send_message(device_id_t device_id, packet_t *packet, services_t sender)
 {
         netif_device_t *device;
         size_t length;
-        packet_t next;
+        packet_t *next;
         int phone;
         int rc;
@@ -262 +262 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;