Changeset c2efbb4 in mainline for uspace/lib/libc/include

Timestamp:

2010-02-20T20:54:53Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

721d4e85, 95c4776

Parents:

f516bc2 (diff), b03a666 (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:

Synchronize with head.

Location:

uspace/lib/libc/include

Files:

• async.h (modified) (1 diff)
• atomicdflt.h (modified) (1 diff)
• ipc/services.h (modified) (1 diff)
• stacktrace.h (modified) (1 diff)

uspace/lib/libc/include/async.h

@@ -259 +259 @@
 }
 
+extern int async_connect_me_to(int, ipcarg_t, ipcarg_t, ipcarg_t);
+extern int async_connect_me_to_blocking(int, ipcarg_t, ipcarg_t, ipcarg_t);
+
 /*
  * User-friendly wrappers for async_share_in_start().

uspace/lib/libc/include/atomicdflt.h

@@ -37 +37 @@
 
 #ifndef LIBC_ARCH_ATOMIC_H_
-#error This file cannot be included directly, include atomic.h instead.
+        #error This file cannot be included directly, include atomic.h instead.
 #endif
 
+#include <stdint.h>
 #include <bool.h>
 
 typedef struct atomic {
-        volatile long count;
+        volatile atomic_count_t count;
 } atomic_t;
 
-static inline void atomic_set(atomic_t *val, long i)
+static inline void atomic_set(atomic_t *val, atomic_count_t i)
 {
-        val->count = i;
+        val->count = i;
 }
 
-static inline long atomic_get(atomic_t *val)
+static inline atomic_count_t atomic_get(atomic_t *val)
 {
-        return val->count;
+        return val->count;
 }
 
-#ifndef CAS 
-static inline bool cas(atomic_t *val, long ov, long nv)
+#ifndef CAS
+static inline bool cas(atomic_t *val, atomic_count_t ov, atomic_count_t nv)
 {
         return __sync_bool_compare_and_swap(&val->count, ov, nv);

uspace/lib/libc/include/ipc/services.h

@@ -47 +47 @@
         SERVICE_FHC,
         SERVICE_OBIO,
-        SERVICE_CLIPBOARD
+        SERVICE_CLIPBOARD,
+        SERVICE_NETWORKING,
+        SERVICE_LO,
+        SERVICE_DP8390,
+        SERVICE_ETHERNET,
+        SERVICE_NILDUMMY,
+        SERVICE_IP,
+        SERVICE_ARP,
+        SERVICE_RARP,
+        SERVICE_ICMP,
+        SERVICE_UDP,
+        SERVICE_TCP,
+        SERVICE_SOCKET
 } services_t;
 

uspace/lib/libc/include/stacktrace.h

@@ -57 +57 @@
 extern void stacktrace_prepare(void);
 extern uintptr_t stacktrace_fp_get(void);
-extern uintptr_t stacktrace_pc_get();
+extern uintptr_t stacktrace_pc_get(void);
 
 #endif