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

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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/lib/packet/generic/packet_server.c (modified) (8 diffs)

uspace/lib/packet/generic/packet_server.c

@@ -135 +135 @@
 /** Creates a new packet of dimensions at least as given.
  *
- * Should be used only when the global data are locked.
- *
  * @param[in] length    The total length of the packet, including the header,
  *                      the addresses and the data of the packet.
@@ -153 +151 @@
         packet_t *packet;
         int rc;
+
+        assert(fibril_mutex_is_locked(&ps_globals.lock));
 
         // already locked
@@ -233 +233 @@
 /** Release the packet and returns it to the appropriate free packet queue.
  *
- * Should be used only when the global data are locked.
- *
  * @param[in] packet    The packet to be released.
  *
@@ -242 +240 @@
         int index;
         int result;
+
+        assert(fibril_mutex_is_locked(&ps_globals.lock));
 
         for (index = 0; (index < FREE_QUEUES_COUNT - 1) &&
@@ -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;