diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 16:14:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:14:53 -0800 |
| commit | 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd (patch) | |
| tree | 81138dd64a4b9ea18c3cfd5c69783add6deeb201 /libc/kernel/common/linux/ublock.h | |
| parent | 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 (diff) | |
| download | bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.zip bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.gz bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.bz2 | |
Revert "Update bionic kernel headers using update_all.py"
This reverts commit 94a85f663694e1869acb1c2e8a3c374a6fa3ab86
There is a smoke test failure for Prime but Crespo/Stingray are fine. Will revert the change for now until further investigation is made.
Diffstat (limited to 'libc/kernel/common/linux/ublock.h')
| -rw-r--r-- | libc/kernel/common/linux/ublock.h | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/libc/kernel/common/linux/ublock.h b/libc/kernel/common/linux/ublock.h index 59a9aab..aa19a81 100644 --- a/libc/kernel/common/linux/ublock.h +++ b/libc/kernel/common/linux/ublock.h @@ -7,80 +7,75 @@ *** structures, and macros generated from the original header, and thus, *** contains no copyrightable information. *** - *** To edit the content of this header, modify the corresponding - *** source file (e.g. under external/kernel-headers/original/) then - *** run bionic/libc/kernel/tools/update_all.py - *** - *** Any manual change here will be lost the next time this script will - *** be run. You've been warned! - *** **************************************************************************** ****************************************************************************/ #ifndef __UBLOCK_H_ #define __UBLOCK_H_ + #include <linux/types.h> + #define UBLOCK_VERSION 0 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + enum { UBLOCK_INIT_IN = 0, UBLOCK_INIT_OUT = 1, UBLOCK_READY_IN = 2, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ UBLOCK_READY_OUT = 3, UBLOCK_READ_IN = 4, UBLOCK_READ_OUT = 5, UBLOCK_WRITE_IN = 6, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ UBLOCK_WRITE_OUT = 7, }; + struct ublock_in_header { __u32 seq; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 opcode; }; + struct ublock_out_header { __u32 seq; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 opcode; }; + struct ublock_init_in { __u32 version; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 max_buf; __u32 index; }; + struct ublock_init_out { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 version; __u32 max_buf; __u64 size; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct ublock_ready_in { __u32 _unused; }; + struct ublock_ready_out { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 _unused; }; + struct ublock_read_in { __u64 offset; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u64 length; }; + struct ublock_read_out { __s32 status; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u8 data[]; }; + struct ublock_write_in { __u64 offset; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u64 length; __u8 data[]; }; + struct ublock_write_out { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __s32 status; }; + #endif + |