Changeset ff381a7 in mainline for abi/include

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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:

abi/include/abi

Files:

• errno.h (modified) (1 diff)
• fourcc.h (moved) (moved from uspace/lib/c/include/fourcc.h ) (2 diffs)
• ipc/interfaces.h (added)

abi/include/abi/errno.h

@@ -62 +62 @@
 #define EPARTY         -8
 
-#define EEXISTS        -9   /* Entry already exists */
+#define EEXIST         -9   /* Entry already exists */
 #define EBADMEM        -10  /* Bad memory pointer */
 #define ENOTSUP        -11  /* Not supported */

abi/include/abi/fourcc.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_FOURCC_H_
-#define LIBC_FOURCC_H_
+#ifndef ABI_FOURCC_H_
+#define ABI_FOURCC_H_
 
-#include <libarch/common.h>
-
-typedef uint32_t fourcc_t;
+#include "../../../common.h"
 
 #define FOURCC(a, b, c, d) \
@@ -44 +42 @@
             (((UINT32_T) (c)) << 16) | (((UINT32_T) (d)) << 24))
 
+#define CC_COMPACT(a) \
+        ((UINT32_T) (a) & 0x7f)
+
+#define FOURCC_COMPACT(a, b, c, d) \
+        ((CC_COMPACT(a) << 4) | (CC_COMPACT(b) << 11) | \
+            (CC_COMPACT(c) << 18) | (CC_COMPACT(d) << 25))
+
 #endif