Changeset 71b00dcc in mainline for uspace/srv/net/structures/packet/packet_remote.c

Timestamp:

2010-03-07T22:51:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

60ab6c3

Parents:

b5cbff4 (diff), 31c80a5 (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 from lp:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/structures/packet/packet_remote.c (modified) (4 diffs)

uspace/srv/net/structures/packet/packet_remote.c

@@ -60 +60 @@
  *  @returns 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_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 ){
+int packet_translate(int phone, packet_ref packet, packet_id_t packet_id){
         ERROR_DECLARE;
 
-        ipcarg_t                        size;
-        packet_t                        next;
+        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){
+                return EINVAL;
         }
-        if(( ** packet ).next ){
-                return packet_translate( phone, & next, ( ** packet ).next );
+        *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 ){
+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;
+        aid_t message;
+        ipc_call_t answer;
+        ipcarg_t result;
 
-        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 ))){
-                munmap( * packet, size );
-                async_wait_for( message, NULL );
+        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))){
+                munmap(*packet, size);
+                async_wait_for(message, NULL);
                 return ERROR_CODE;
         }
-        async_wait_for( message, & 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 ){
+packet_t packet_get_4(int phone, size_t max_content, size_t addr_len, size_t max_prefix, size_t max_suffix){
         ERROR_DECLARE;
 
@@ -105 +107 @@
         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 = pm_find( packet_id );
-        if( ! packet ){
-                if( ERROR_OCCURRED( packet_return( phone, & packet, packet_id, size ))){
+        packet = pm_find(packet_id);
+        if(! packet){
+                if(ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size))){
                         return NULL;
                 }
@@ -117 +119 @@
 }
 
-packet_t packet_get_1( int phone, size_t content ){
+packet_t packet_get_1(int phone, size_t content){
         ERROR_DECLARE;
 
-        ipcarg_t        packet_id;
-        ipcarg_t        size;
-        packet_t        packet;
+        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 = pm_find( packet_id );
-        if( ! packet ){
-                if( ERROR_OCCURRED( packet_return( phone, & packet, packet_id, size ))){
+        packet = pm_find(packet_id);
+        if(! packet){
+                if(ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size))){
                         return NULL;
                 }
@@ -136 +138 @@
 }
 
-void pq_release( int phone, packet_id_t packet_id ){
-        async_msg_1( phone, NET_PACKET_RELEASE, packet_id );
+void pq_release(int phone, packet_id_t packet_id){
+        async_msg_1(phone, NET_PACKET_RELEASE, packet_id);
 }