diff options
author | Rom Lemarchand <romlem@google.com> | 2014-01-02 19:31:53 -0800 |
---|---|---|
committer | Rom Lemarchand <romlem@android.com> | 2014-01-03 21:27:05 +0000 |
commit | ddc20de1483028ee0b4401266499a59631e9d659 (patch) | |
tree | afe715bfbf684fcb3fe9c38b490eb80c857329f6 /include/sync | |
parent | f5447b0eb9cd2157f4935477f05d4c92dcda37c8 (diff) | |
download | system_core-ddc20de1483028ee0b4401266499a59631e9d659.zip system_core-ddc20de1483028ee0b4401266499a59631e9d659.tar.gz system_core-ddc20de1483028ee0b4401266499a59631e9d659.tar.bz2 |
move sync headers from include to libsync
Make sw_sync.h private
Change-Id: I0b120ebe81fd4a191b7aa4b6a8de4f64d16e2b3e
Diffstat (limited to 'include/sync')
-rw-r--r-- | include/sync/sw_sync.h | 37 | ||||
-rw-r--r-- | include/sync/sync.h | 54 |
2 files changed, 0 insertions, 91 deletions
diff --git a/include/sync/sw_sync.h b/include/sync/sw_sync.h deleted file mode 100644 index 3bf4110..0000000 --- a/include/sync/sw_sync.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * sw_sync.h - * - * Copyright 2013 Google, Inc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __SYS_CORE_SW_SYNC_H -#define __SYS_CORE_SW_SYNC_H - -#include "sync.h" - -__BEGIN_DECLS - -/* - * sw_sync is mainly intended for testing and should not be compiled into - * production kernels - */ - -int sw_sync_timeline_create(void); -int sw_sync_timeline_inc(int fd, unsigned count); -int sw_sync_fence_create(int fd, const char *name, unsigned value); - -__END_DECLS - -#endif /* __SYS_CORE_SW_SYNC_H */ diff --git a/include/sync/sync.h b/include/sync/sync.h deleted file mode 100644 index 2e5d82f..0000000 --- a/include/sync/sync.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * sync.h - * - * Copyright 2012 Google, Inc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __SYS_CORE_SYNC_H -#define __SYS_CORE_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, int timeout); -int sync_merge(const char *name, int fd1, int fd2); -struct sync_fence_info_data *sync_fence_info(int fd); -struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info, - struct sync_pt_info *itr); -void sync_fence_info_free(struct sync_fence_info_data *info); - -__END_DECLS - -#endif /* __SYS_CORE_SYNC_H */ |