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

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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) (2 diffs)

uspace/lib/net/generic/packet_remote.c

@@ -32 +32 @@
 
 /** @file
- *  Packet client interface implementation for standalone remote modules.
+ *  Packet client interface implementation for remote modules.
  *  @see packet_client.h
  */
@@ -47 +47 @@
 #include <packet/packet_header.h>
 #include <packet/packet_messages.h>
+#include <packet_remote.h>
 
-/** Obtains the packet from the packet server as the shared memory block.
- *  Creates the local packet mapping as well.
- *  @param[in] phone The packet server module phone.
- *  @param[out] packet The packet reference pointer to store the received packet reference.
- *  @param[in] packet_id The packet identifier.
- *  @param[in] size The packet total size in bytes.
- *  @returns EOK on success.
- *  @returns Other error codes as defined for the pm_add() function.
- *  @returns Other error codes as defined for the async_share_in_start() function.
+/** Obtain the packet from the packet server as the shared memory block.
+ *
+ * Create the local packet mapping as well.
+ *
+ * @param[in]  phone     The packet server module phone.
+ * @param[out] packet    The packet reference pointer to store the received
+ *                       packet reference.
+ * @param[in]  packet_id The packet identifier.
+ * @param[in]  size      The packet total size in bytes.
+ *
+ * @return EOK on success.
+ * @return Other error codes as defined for the pm_add() function.
+ * @return Other error codes as defined for the async_share_in_start() function.
+ *
  */
-int packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size);
-
-int packet_translate(int phone, packet_ref packet, packet_id_t packet_id){
+static int packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size){
         ERROR_DECLARE;
-
-        ipcarg_t size;
-        packet_t next;
-
-        if(! packet){
-                return EINVAL;
-        }
-        *packet = pm_find(packet_id);
-        if(!(*packet)){
-                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id, &size));
-                ERROR_PROPAGATE(packet_return(phone, packet, packet_id, size));
-        }
-        if((** packet).next){
-                return packet_translate(phone, &next, (** packet).next);
-        }else return EOK;
-}
-
-int packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size){
-        ERROR_DECLARE;
-
-        aid_t message;
+        
         ipc_call_t answer;
-        ipcarg_t result;
-
-        message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
+        aid_t message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
         *packet = (packet_t) as_get_mappable_page(size);
-        if(ERROR_OCCURRED(async_share_in_start_0_0(phone, * packet, size))
-                || ERROR_OCCURRED(pm_add(*packet))){
+        if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size))
+            || ERROR_OCCURRED(pm_add(*packet))) {
                 munmap(*packet, size);
                 async_wait_for(message, NULL);
                 return ERROR_CODE;
         }
+        
+        ipcarg_t result;
         async_wait_for(message, &result);
+        
         return result;
 }
 
-packet_t packet_get_4(int phone, size_t max_content, size_t addr_len, size_t max_prefix, size_t max_suffix){
+int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id)
+{
         ERROR_DECLARE;
+        
+        if (!packet)
+                return EINVAL;
+        
+        *packet = pm_find(packet_id);
+        if (!(*packet)) {
+                ipcarg_t size;
+                
+                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id, &size));
+                ERROR_PROPAGATE(packet_return(phone, packet, packet_id, size));
+        }
+        if ((** packet).next) {
+                packet_t next;
+                
+                return packet_translate_remote(phone, &next, (** packet).next);
+        }
+        
+        return EOK;
+}
 
+packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
+    size_t max_prefix, size_t max_suffix)
+{
+        ERROR_DECLARE;
+        
         ipcarg_t packet_id;
         ipcarg_t size;
-        packet_t packet;
-
-        if(ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len, max_prefix, max_suffix, &packet_id, &size))){
+        
+        if (ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4, max_content,
+            addr_len, max_prefix, max_suffix, &packet_id, &size)))
                 return NULL;
+        
+        
+        packet_t packet = pm_find(packet_id);
+        if (!packet) {
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size)))
+                        return NULL;
         }
-        packet = pm_find(packet_id);
-        if(! packet){
-                if(ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size))){
-                        return NULL;
-                }
-        }
+        
         return packet;
 }
 
-packet_t packet_get_1(int phone, size_t content){
+packet_t packet_get_1_remote(int phone, size_t content)
+{
         ERROR_DECLARE;
-
+        
         ipcarg_t packet_id;
         ipcarg_t size;
-        packet_t packet;
-
-        if(ERROR_OCCURRED(async_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id, &size))){
+        
+        if (ERROR_OCCURRED(async_req_1_2(phone, NET_PACKET_CREATE_1, content,
+            &packet_id, &size)))
                 return NULL;
+        
+        packet_t packet = pm_find(packet_id);
+        if (!packet) {
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size)))
+                        return NULL;
         }
-        packet = pm_find(packet_id);
-        if(! packet){
-                if(ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size))){
-                        return NULL;
-                }
-        }
+        
         return packet;
 }
 
-void pq_release(int phone, packet_id_t packet_id){
+void pq_release_remote(int phone, packet_id_t packet_id)
+{
         async_msg_1(phone, NET_PACKET_RELEASE, packet_id);
 }