Changeset 7bdcc45 in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/nil/eth/eth.c (modified) (6 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -238 +238 @@
 
         while (true) {
-                switch (IPC_GET_METHOD(*icall)) {
+                switch (IPC_GET_IMETHOD(*icall)) {
                 case NET_NIL_DEVICE_STATE:
                         nil_device_state_msg_local(0, IPC_GET_DEVICE(icall),
@@ -251 +251 @@
                                     IPC_GET_DEVICE(icall), packet, 0);
                         }
-                        ipc_answer_0(iid, (ipcarg_t) rc);
+                        ipc_answer_0(iid, (sysarg_t) rc);
                         break;
                 default:
-                        ipc_answer_0(iid, (ipcarg_t) ENOTSUP);
+                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
                 }
                 
@@ -315 +315 @@
                         device->mtu = ETH_MAX_TAGGED_CONTENT(device->flags);
                 
-                printf("Device %d already exists:\tMTU\t= %d\n",
+                printf("Device %d already exists:\tMTU\t= %zu\n",
                     device->device_id, device->mtu);
                 fibril_rwlock_write_unlock(&eth_globals.devices_lock);
@@ -407 +407 @@
         }
         
-        printf("%s: Device registered (id: %d, service: %d: mtu: %d, "
+        printf("%s: Device registered (id: %d, service: %d: mtu: %zu, "
             "mac: %x:%x:%x:%x:%x:%x, flags: 0x%x)\n",
             NAME, device->device_id, device->service, device->mtu,
@@ -849 +849 @@
         
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -926 +926 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;