diff options
author | Matthew Xie <mattx@google.com> | 2012-09-18 16:14:30 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 16:14:30 -0700 |
commit | ad2d45b15aae80ba254277c3d1fa036207d8b926 (patch) | |
tree | 27ebefd16a44995abb1b16e5c279a1bd169cf0f5 /btif/include/btif_sock_thread.h | |
parent | cc914cffd521b2e6e1be804c82aea2388b843ebf (diff) | |
download | external_bluetooth_bluedroid-ad2d45b15aae80ba254277c3d1fa036207d8b926.zip external_bluetooth_bluedroid-ad2d45b15aae80ba254277c3d1fa036207d8b926.tar.gz external_bluetooth_bluedroid-ad2d45b15aae80ba254277c3d1fa036207d8b926.tar.bz2 |
Revert "Header file and whitespace cleanups"
This reverts commit cc914cffd521b2e6e1be804c82aea2388b843ebf
More changes in the original CL after my cherry-pick.
Change-Id: Ic144dba96aeb8a60611baac7565c9f628ab8f9eb
Diffstat (limited to 'btif/include/btif_sock_thread.h')
-rw-r--r-- | btif/include/btif_sock_thread.h | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/btif/include/btif_sock_thread.h b/btif/include/btif_sock_thread.h index 3678673..0f5212f 100644 --- a/btif/include/btif_sock_thread.h +++ b/btif/include/btif_sock_thread.h @@ -45,34 +45,29 @@ * ************************************************************************************/ +/************************************************************************************ + * + * Filename: btif_sock_thread.h + * + * Description: + * + ***********************************************************************************/ + #ifndef BTIF_SOCK_THREAD_H #define BTIF_SOCK_THREAD_H - #include <hardware/bt_sock.h> -/******************************************************************************* -** Constants & Macros -********************************************************************************/ - -#define SOCK_THREAD_FD_RD 1 /* BT socket read signal */ -#define SOCK_THREAD_FD_WR (1 << 1) /* BT socket write signal */ -#define SOCK_THREAD_FD_EXCEPTION (1 << 2) /* BT socket exception singal */ -#define SOCK_THREAD_ADD_FD_SYNC (1 << 3) /* Add BT socket fd in current socket - poll thread context immediately */ - -/******************************************************************************* -** Functions -********************************************************************************/ - -typedef void (*btsock_signaled_cb)(int fd, int type, int flags, uint32_t user_id); -typedef void (*btsock_cmd_cb)(int cmd_fd, int type, int size, uint32_t user_id); - +#define SOCK_THREAD_FD_RD 1 //bt socket read signal +#define SOCK_THREAD_FD_WR (1 << 1) //bt socket write signal +#define SOCK_THREAD_FD_EXCEPTION (1 << 2) //bt socket exception singal +#define SOCK_THREAD_ADD_FD_SYNC (1 << 3) //add bt socket fd in current socket poll thread context immediately int btsock_thread_init(); int btsock_thread_add_fd(int handle, int fd, int type, int flags, uint32_t user_id); int btsock_thread_wakeup(int handle); -int btsock_thread_post_cmd(int handle, int cmd_type, const unsigned char* cmd_data, - int data_size, uint32_t user_id); +int btsock_thread_post_cmd(int handle, int cmd_type, const unsigned char* cmd_data, int data_size, uint32_t user_id); +typedef void (*btsock_signaled_cb)(int fd, int type, int flags, uint32_t user_id); +typedef void (*btsock_cmd_cb)(int cmd_fd, int type, int size, uint32_t user_id); int btsock_thread_create(btsock_signaled_cb callback, btsock_cmd_cb cmd_callback); int btsock_thread_exit(int handle); - #endif + |