Changeset 71b00dcc in mainline for uspace/srv/net/tl/icmp/icmp.h

Timestamp:

2010-03-07T22:51:38Z (15 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/tl/icmp/icmp.h (modified) (4 diffs)

uspace/srv/net/tl/icmp/icmp.h

@@ -66 +66 @@
  *  Receiving fibril sets the associated reply with the return value and signals the event.
  */
-INT_MAP_DECLARE( icmp_replies, icmp_reply_t );
+INT_MAP_DECLARE(icmp_replies, icmp_reply_t);
 
 /** Echo specific data map.
@@ -72 +72 @@
  *  The identifier is used in the future semi-remote calls instead of the ICMP phone.
  */
-INT_MAP_DECLARE( icmp_echo_data, icmp_echo_t );
+INT_MAP_DECLARE(icmp_echo_data, icmp_echo_t);
 
 /** ICMP reply data.
@@ -79 +79 @@
         /** Reply result.
          */
-        int                                     result;
+        int result;
         /** Safety lock.
          */
-        fibril_mutex_t          mutex;
+        fibril_mutex_t mutex;
         /** Received or timeouted reply signaling.
          */
-        fibril_condvar_t        condvar;
+        fibril_condvar_t condvar;
 };
 
@@ -93 +93 @@
         /** IP module phone.
          */
-        int                             ip_phone;
+        int ip_phone;
         /** Packet dimension.
          */
-        packet_dimension_t      packet_dimension;
+        packet_dimension_t packet_dimension;
         /** Networking module phone.
          */
-        int                             net_phone;
+        int net_phone;
         /** Indicates whether ICMP error reporting is enabled.
          */
-        int                             error_reporting;
+        int error_reporting;
         /** Indicates whether ICMP echo replying (ping) is enabled.
          */
-        int                             echo_replying;
+        int echo_replying;
         /** The last used identifier number.
          */
-        icmp_param_t    last_used_id;
+        icmp_param_t last_used_id;
         /** The budled modules assigned echo specific data.
          */
-        icmp_echo_data_t        echo_data;
+        icmp_echo_data_t echo_data;
         /** Echo timeout locks.
          */
-        icmp_replies_t  replies;
+        icmp_replies_t replies;
         /** Safety lock.
          */
-        fibril_rwlock_t lock;
+        fibril_rwlock_t lock;
 };