Changeset f14291b in mainline for uspace/lib/c/include/net/icmp_common.h

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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/c/include/net/icmp_common.h (moved) (moved from uspace/lib/socket/include/icmp_common.h ) (1 diff)

uspace/lib/c/include/net/icmp_common.h

@@ -27 +27 @@
  */
 
-/** @addtogroup icmp
+/** @addtogroup libc
  *  @{
  */
 
 /** @file
- *  ICMP module common interface.
+ * ICMP module common interface.
  */
 
-#ifndef __NET_ICMP_COMMON_H__
-#define __NET_ICMP_COMMON_H__
+#ifndef LIBC_ICMP_COMMON_H_
+#define LIBC_ICMP_COMMON_H_
 
 #include <ipc/services.h>
-
 #include <sys/time.h>
 
-/** Default timeout for incoming connections in microseconds.
- */
+/** Default timeout for incoming connections in microseconds. */
 #define ICMP_CONNECT_TIMEOUT    (1 * 1000 * 1000)
 
-/** Connects to the ICMP module.
- *  @param service The ICMP module service. Ignored parameter.
- *  @param[in] timeout The connection timeout in microseconds. No timeout if set to zero (0).
- *  @returns The ICMP module phone on success.
- *  @returns The ICMP socket identifier if called by the bundle module.
- *  @returns ETIMEOUT if the connection timeouted.
- */
-extern int icmp_connect_module(services_t service, suseconds_t timeout);
+extern int icmp_connect_module(services_t, suseconds_t);
 
 #endif