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

Timestamp:

2010-12-25T21:20:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/net/generic/packet_remote.c (modified) (10 diffs)

uspace/lib/net/generic/packet_remote.c

@@ -64 +64 @@
  */
 static int
-packet_return(int phone, packet_t *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 +72 @@
         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 +86 @@
         }
         
-        ipcarg_t result;
+        sysarg_t result;
         async_wait_for(message, &result);
         
@@ -107 +107 @@
  *                      function.
  */
-int packet_translate_remote(int phone, packet_t *packet, packet_id_t packet_id)
+int packet_translate_remote(int phone, packet_t **packet, packet_id_t packet_id)
 {
         int rc;
@@ -116 +116 @@
         *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 +127 @@
         }
         if ((*packet)->next) {
-                packet_t next;
+                packet_t *next;
                 
                 return packet_translate_remote(phone, &next, (*packet)->next);
@@ -148 +148 @@
  * @return              NULL on error.
  */
-packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
+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 +161 @@
         
         
-        packet_t packet = pm_find(packet_id);
+        packet_t *packet = pm_find(packet_id);
         if (!packet) {
                 rc = packet_return(phone, &packet, packet_id, size);
@@ -180 +180 @@
  * @return              NULL on error.
  */
-packet_t packet_get_1_remote(int phone, size_t content)
-{
-        ipcarg_t packet_id;
-        ipcarg_t size;
+packet_t *packet_get_1_remote(int phone, size_t content)
+{
+        sysarg_t packet_id;
+        sysarg_t size;
         int rc;
         
@@ -191 +191 @@
                 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);