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

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/include/net/icmp_common.h (moved) (moved from uspace/lib/libc/include/atomic.h ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2009 Lukas Mejdrech
  * All rights reserved.
  *
@@ -28 +28 @@
 
 /** @addtogroup libc
- * @{
- */
-/** @file
+ *  @{
  */
 
-#ifndef LIBC_ATOMIC_H_
-#define LIBC_ATOMIC_H_
+/** @file
+ * ICMP module common interface.
+ */
 
-typedef struct atomic {
-        volatile long count;
-} atomic_t;
+#ifndef LIBC_ICMP_COMMON_H_
+#define LIBC_ICMP_COMMON_H_
 
-#include <libarch/atomic.h>
+#include <ipc/services.h>
+#include <sys/time.h>
 
-static inline void atomic_set(atomic_t *val, long i)
-{
-        val->count = i;
-}
+/** Default timeout for incoming connections in microseconds (1 sec). */
+#define ICMP_CONNECT_TIMEOUT  1000000
 
-static inline long atomic_get(atomic_t *val)
-{
-        return val->count;
-}
+extern int icmp_connect_module(suseconds_t);
 
 #endif