Changeset f2962621 in mainline for uspace/lib/packet/generic/packet_server.c

Timestamp:

2010-12-17T10:14:01Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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 with usb/development

File:

• uspace/lib/packet/generic/packet_server.c (modified) (4 diffs)

uspace/lib/packet/generic/packet_server.c

@@ -327 +327 @@
 
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -337 +337 @@
                         return ENOMEM;
                 *answer_count = 2;
-                IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
-                IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
+                IPC_SET_ARG1(*answer, (sysarg_t) packet->packet_id);
+                IPC_SET_ARG2(*answer, (sysarg_t) packet->length);
                 return EOK;
         
@@ -351 +351 @@
                         return ENOMEM;
                 *answer_count = 2;
-                IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
-                IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
+                IPC_SET_ARG1(*answer, (sysarg_t) packet->packet_id);
+                IPC_SET_ARG2(*answer, (sysarg_t) packet->length);
                 return EOK;
         
@@ -365 +365 @@
                 if (!packet_is_valid(packet))
                         return ENOENT;
-                IPC_SET_ARG1(*answer, (ipcarg_t) packet->length);
+                IPC_SET_ARG1(*answer, (sysarg_t) packet->length);
                 *answer_count = 1;
                 return EOK;