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

Timestamp:

2009-12-03T19:25:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9510be2

Parents:

cb3d641a (diff), 22e6802 (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.

Location:

uspace/lib/libc/include

Files:

• atomic.h (modified) (2 diffs)
• atomicdflt.h (added)
• futex.h (modified) (1 diff)
• io/console.h (modified) (1 diff)
• ipc/console.h (modified) (1 diff)
• string.h (modified) (1 diff)
• unistd.h (modified) (2 diffs)

uspace/lib/libc/include/atomic.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -36 +36 @@
 #define LIBC_ATOMIC_H_
 
-typedef struct atomic {
-        volatile long count;
-} atomic_t;
-
 #include <libarch/atomic.h>
-
-static inline void atomic_set(atomic_t *val, long i)
-{
-        val->count = i;
-}
-
-static inline long atomic_get(atomic_t *val)
-{
-        return val->count;
-}
 
 #endif

uspace/lib/libc/include/futex.h

@@ -46 +46 @@
 extern int futex_down(futex_t *futex);
 extern int futex_trydown(futex_t *futex);
-extern int futex_down_timeout(futex_t *futex, uint32_t usec, int flags);
 extern int futex_up(futex_t *futex);
 

uspace/lib/libc/include/io/console.h

@@ -69 +69 @@
 
 extern int console_get_size(int phone, int *cols, int *rows);
+extern int console_get_pos(int phone, int *col, int *row);
 extern void console_goto(int phone, int col, int row);
 

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

@@ -43 +43 @@
         CONSOLE_GET_COLOR_CAP,
         CONSOLE_GET_EVENT,
+        CONSOLE_GET_POS,
         CONSOLE_GOTO,
         CONSOLE_CLEAR,

uspace/lib/libc/include/string.h

@@ -73 +73 @@
 extern void str_append(char *dest, size_t size, const char *src);
 
-extern void wstr_nstr(char *dst, const wchar_t *src, size_t size);
+extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
+extern char *wstr_to_astr(const wchar_t *src);
+extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
 
 extern char *str_chr(const char *str, wchar_t ch);

uspace/lib/libc/include/unistd.h

@@ -51 +51 @@
 #endif
 
+typedef uint32_t useconds_t;
+
 extern int dup2(int oldfd, int newfd);
 
@@ -68 +70 @@
 
 extern void _exit(int status) __attribute__ ((noreturn));
-extern int usleep(unsigned long usec);
-extern unsigned int sleep(unsigned int seconds);
+extern int usleep(useconds_t uses);
+extern unsigned int sleep(unsigned int se);
 
 #endif