Changeset 925a21e in mainline for abi/include/synch.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:

• abi/include/synch.h (moved) (moved from kernel/generic/include/synch/synch.h ) (1 diff)

abi/include/synch.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_SYNCH_H_
-#define KERN_SYNCH_H_
+#ifndef ABI_SYNCH_H_
+#define ABI_SYNCH_H_
 
 /** Request with no timeout. */
-#define SYNCH_NO_TIMEOUT        0
+#define SYNCH_NO_TIMEOUT  0
 
 /** No flags specified. */
-#define SYNCH_FLAGS_NONE                0
+#define SYNCH_FLAGS_NONE           0
 /** Non-blocking operation request. */
-#define SYNCH_FLAGS_NON_BLOCKING        (1 << 0)
+#define SYNCH_FLAGS_NON_BLOCKING   (1 << 0)
 /** Interruptible operation. */
-#define SYNCH_FLAGS_INTERRUPTIBLE       (1 << 1)
+#define SYNCH_FLAGS_INTERRUPTIBLE  (1 << 1)
 
 /** Could not satisfy the request without going to sleep. */
-#define ESYNCH_WOULD_BLOCK      1
+#define ESYNCH_WOULD_BLOCK  1
 /** Timeout occurred. */
-#define ESYNCH_TIMEOUT          2
+#define ESYNCH_TIMEOUT      2
 /** Sleep was interrupted. */
-#define ESYNCH_INTERRUPTED      4
+#define ESYNCH_INTERRUPTED  4
 /** Operation succeeded without sleeping. */
-#define ESYNCH_OK_ATOMIC        8
+#define ESYNCH_OK_ATOMIC    8
 /** Operation succeeded and did sleep. */
-#define ESYNCH_OK_BLOCKED       16
+#define ESYNCH_OK_BLOCKED   16
 
 #define SYNCH_FAILED(rc) \
         ((rc) & (ESYNCH_WOULD_BLOCK | ESYNCH_TIMEOUT | ESYNCH_INTERRUPTED))
+
 #define SYNCH_OK(rc) \
         ((rc) & (ESYNCH_OK_ATOMIC | ESYNCH_OK_BLOCKED))