Changeset eb522e8 in mainline for uspace/lib/net/generic/packet_remote.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/lib/net/generic/packet_remote.c (modified) (11 diffs)

uspace/lib/net/generic/packet_remote.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
-#include <ipc/ipc.h>
 #include <ipc/packet.h>
 #include <sys/mman.h>
@@ -64 +63 @@
  */
 static int
-packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size)
+packet_return(int phone, packet_t **packet, packet_id_t packet_id, size_t size)
 {
         ipc_call_t answer;
@@ -72 +71 @@
         message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
 
-        *packet = (packet_t) as_get_mappable_page(size);
+        *packet = (packet_t *) as_get_mappable_page(size);
         rc = async_share_in_start_0_0(phone, *packet, size);
         if (rc != EOK) {
@@ -86 +85 @@
         }
         
-        ipcarg_t result;
+        sysarg_t result;
         async_wait_for(message, &result);
         
@@ -100 +99 @@
  * @param[out] packet   The packet reference.
  * @param[in] packet_id The packet identifier.
- * @returns             EOK on success.
- * @returns             EINVAL if the packet parameter is NULL.
- * @returns             Other error codes as defined for the NET_PACKET_GET_SIZE
+ * @return              EOK on success.
+ * @return              EINVAL if the packet parameter is NULL.
+ * @return              Other error codes as defined for the NET_PACKET_GET_SIZE
  *                      message.
- * @returns             Other error codes as defined for the packet_return()
+ * @return              Other error codes as defined for the packet_return()
  *                      function.
  */
-int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id)
+int packet_translate_remote(int phone, packet_t **packet, packet_id_t packet_id)
 {
         int rc;
@@ -116 +115 @@
         *packet = pm_find(packet_id);
         if (!*packet) {
-                ipcarg_t size;
+                sysarg_t size;
                 
                 rc = async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
@@ -127 +126 @@
         }
         if ((*packet)->next) {
-                packet_t next;
+                packet_t *next;
                 
                 return packet_translate_remote(phone, &next, (*packet)->next);
@@ -145 +144 @@
  * @param[in] max_content The maximal content length in bytes.
  * @param[in] max_suffix The maximal suffix length in bytes.
- * @returns             The packet reference.
- * @returns             NULL on error.
- */
-packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
+ * @return              The packet reference.
+ * @return              NULL on error.
+ */
+packet_t *packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
     size_t max_prefix, size_t max_suffix)
 {
-        ipcarg_t packet_id;
-        ipcarg_t size;
+        sysarg_t packet_id;
+        sysarg_t size;
         int rc;
         
@@ -161 +160 @@
         
         
-        packet_t packet = pm_find(packet_id);
+        packet_t *packet = pm_find(packet_id);
         if (!packet) {
                 rc = packet_return(phone, &packet, packet_id, size);
@@ -177 +176 @@
  * @param[in] phone     The packet server module phone.
  * @param[in] content   The maximal content length in bytes.
- * @returns             The packet reference.
- * @returns             NULL on error.
- */
-packet_t packet_get_1_remote(int phone, size_t content)
-{
-        ipcarg_t packet_id;
-        ipcarg_t size;
+ * @return              The packet reference.
+ * @return              NULL on error.
+ */
+packet_t *packet_get_1_remote(int phone, size_t content)
+{
+        sysarg_t packet_id;
+        sysarg_t size;
         int rc;
         
@@ -191 +190 @@
                 return NULL;
         
-        packet_t packet = pm_find(packet_id);
+        packet_t *packet = pm_find(packet_id);
         if (!packet) {
                 rc = packet_return(phone, &packet, packet_id, size);