aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-06-13 16:40:54 -0700
committerJesse Hall <jessehall@google.com>2012-06-19 09:52:24 -0700
commit3be33e46187bfb1e42099bb4ba061a494356576c (patch)
treec98cfa51f4f167a22c3e72f1bb5ab293166df603 /include
parent4d4cc9ecc74ca7df7453b73e8ed62ff36c658f09 (diff)
downloadsystem_core-3be33e46187bfb1e42099bb4ba061a494356576c.tar.gz
system_core-3be33e46187bfb1e42099bb4ba061a494356576c.tar.bz2
system_core-3be33e46187bfb1e42099bb4ba061a494356576c.zip
libsync: remove linux includes from sync/sync.h
This change removes the #includes of "linux/*.h" headers from the libsync header. It currently does this by copying the needed structs that are in the linux headers. This is intended to be a temporary solution. Change-Id: Ie7e1a8e05fcf8809ba4aa0e2427efe141dae5327
Diffstat (limited to 'include')
-rw-r--r--include/sync/sync.h21
1 files changed, 19 insertions, 2 deletions
diff --git a/include/sync/sync.h b/include/sync/sync.h
index 6aa5f2d8..f015fa16 100644
--- a/include/sync/sync.h
+++ b/include/sync/sync.h
@@ -19,11 +19,28 @@
#ifndef __SYS_CORE_SYNC_H
#define __SYS_CORE_SYNC_H
-#include <linux/sync.h>
-#include <linux/sw_sync.h>
+#include <sys/cdefs.h>
+#include <stdint.h>
__BEGIN_DECLS
+// XXX: These structs are copied from the header "linux/sync.h".
+struct sync_fence_info_data {
+ uint32_t len;
+ char name[32];
+ int32_t status;
+ uint8_t pt_info[0];
+};
+
+struct sync_pt_info {
+ uint32_t len;
+ char obj_name[32];
+ char driver_name[32];
+ int32_t status;
+ uint64_t timestamp_ns;
+ uint8_t driver_data[0];
+};
+
/* timeout in msecs */
int sync_wait(int fd, unsigned int timeout);
int sync_merge(const char *name, int fd1, int fd2);