Changeset f51f193 in mainline for uspace/lib/c/include/fourcc.h

Timestamp:

2011-07-12T03:00:14Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

6817eba

Parents:

eca52a8 (diff), 026793d (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/c/include/fourcc.h (moved) (moved from uspace/lib/c/include/devman_obsolete.h ) (2 diffs)

uspace/lib/c/include/fourcc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
- * Copyright (c) 2010 Lenka Trochtova 
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -34 +33 @@
  */
 
-#ifndef LIBC_DEVMAN_OBSOLETE_H_
-#define LIBC_DEVMAN_OBSOLETE_H_
+#ifndef LIBC_FOURCC_H_
+#define LIBC_FOURCC_H_
 
-#include <ipc/devman.h>
-#include <async.h>
-#include <bool.h>
+#include <libarch/common.h>
 
-extern int devman_obsolete_get_phone(devman_interface_t, unsigned int);
-extern void devman_obsolete_hangup_phone(devman_interface_t);
-
-extern int devman_obsolete_device_connect(devman_handle_t, unsigned int);
-extern int devman_obsolete_parent_device_connect(devman_handle_t, unsigned int);
+#define FOURCC(a, b, c, d) \
+        (((UINT32_T) (a)) | (((UINT32_T) (b)) << 8) | \
+            (((UINT32_T) (c)) << 16) | (((UINT32_T) (d)) << 24))
 
 #endif