Changeset 925a21e in mainline for uspace/lib/posix/sys/wait.h

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/posix/sys/wait.h (moved) (moved from uspace/lib/c/include/ipc/fb.h ) (2 diffs)

uspace/lib/posix/sys/wait.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libposix
  * @{
  */
-/** @file
+/** @file Support for waiting.
  */
 
-#ifndef LIBC_FB_H_
-#define LIBC_FB_H_
+#ifndef POSIX_SYS_WAIT_H_
+#define POSIX_SYS_WAIT_H_
 
-#include <ipc/common.h>
+#include "types.h"
 
-typedef enum {
-        FB_PUTCHAR = IPC_FIRST_USER_METHOD,
-        FB_CLEAR,
-        FB_GET_CSIZE,
-        FB_GET_COLOR_CAP,
-        FB_CURSOR_VISIBILITY,
-        FB_CURSOR_GOTO,
-        FB_SCROLL,
-        FB_VIEWPORT_SWITCH,
-        FB_VIEWPORT_CREATE,
-        FB_VIEWPORT_DELETE,
-        FB_SET_STYLE,
-        FB_SET_COLOR,
-        FB_SET_RGB_COLOR,
-        FB_GET_RESOLUTION,
-        FB_DRAW_TEXT_DATA,
-        FB_FLUSH,
-        FB_DRAW_PPM,
-        FB_PREPARE_SHM,
-        FB_DROP_SHM,
-        FB_SHM2PIXMAP,
-        FB_VP_DRAW_PIXMAP,
-        FB_VP2PIXMAP,
-        FB_DROP_PIXMAP,
-        FB_ANIM_CREATE,
-        FB_ANIM_DROP,
-        FB_ANIM_ADDPIXMAP,
-        FB_ANIM_CHGVP,
-        FB_ANIM_START,
-        FB_ANIM_STOP,
-        FB_POINTER_MOVE,
-        FB_SCREEN_YIELD,
-        FB_SCREEN_RECLAIM
-} fb_request_t;
+#undef WIFEXITED
+#undef WEXITSTATUS
+#undef WIFSIGNALED
+#undef WTERMSIG
+#define WIFEXITED(status) __posix_wifexited(status)
+#define WEXITSTATUS(status) __posix_wexitstatus(status)
+#define WIFSIGNALED(status) __posix_wifsignaled(status)
+#define WTERMSIG(status) __posix_wtermsig(status)
 
-enum {
-        FB_CCAP_NONE = 0,
-        FB_CCAP_STYLE,
-        FB_CCAP_INDEXED,
-        FB_CCAP_RGB
-};
+extern int __posix_wifexited(int status);
+extern int __posix_wexitstatus(int status);
+extern int __posix_wifsignaled(int status);
+extern int __posix_wtermsig(int status);
 
+extern posix_pid_t posix_wait(int *stat_ptr);
+extern posix_pid_t posix_waitpid(posix_pid_t pid, int *stat_ptr, int options);
+
+#ifndef LIBPOSIX_INTERNAL
+        #define wait posix_wait
+        #define waitpid posix_waitpid
 #endif
+
+#endif /* POSIX_SYS_WAIT_H_ */
 
 /** @}