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

Timestamp:

2011-01-23T20:09:13Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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) (7 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) &&
@@ -322 +322 @@
 int
 packet_server_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer,
-    int *answer_count)
+    size_t *answer_count)
 {
         packet_t *packet;
 
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -333 +333 @@
         case NET_PACKET_CREATE_1:
                 packet = packet_get_local(DEFAULT_ADDR_LEN, DEFAULT_PREFIX,
-                    IPC_GET_CONTENT(call), DEFAULT_SUFFIX);
+                    IPC_GET_CONTENT(*call), DEFAULT_SUFFIX);
                 if (!packet)
                         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;
         
         case NET_PACKET_CREATE_4:
                 packet = packet_get_local(
-                    ((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(call)) ?
-                    IPC_GET_ADDR_LEN(call) : DEFAULT_ADDR_LEN),
-                    DEFAULT_PREFIX + IPC_GET_PREFIX(call),
-                    IPC_GET_CONTENT(call),
-                    DEFAULT_SUFFIX + IPC_GET_SUFFIX(call));
+                    ((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(*call)) ?
+                    IPC_GET_ADDR_LEN(*call) : DEFAULT_ADDR_LEN),
+                    DEFAULT_PREFIX + IPC_GET_PREFIX(*call),
+                    IPC_GET_CONTENT(*call),
+                    DEFAULT_SUFFIX + IPC_GET_SUFFIX(*call));
                 if (!packet)
                         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;
         
         case NET_PACKET_GET:
-                packet = pm_find(IPC_GET_ID(call));
+                packet = pm_find(IPC_GET_ID(*call));
                 if (!packet_is_valid(packet))
                         return ENOENT;
@@ -362 +362 @@
         
         case NET_PACKET_GET_SIZE:
-                packet = pm_find(IPC_GET_ID(call));
+                packet = pm_find(IPC_GET_ID(*call));
                 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;
         
         case NET_PACKET_RELEASE:
-                return packet_release_wrapper(IPC_GET_ID(call));
+                return packet_release_wrapper(IPC_GET_ID(*call));
         }