tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "GATT Server refactoring (1/4)" am: 7e3cfe3081

Browse source 
am: b815613e3c

Change-Id: I189bae02003f3e4ed9f3e87a90e08b9b7670a059
This commit is contained in:
Jakub Pawlowski 2016-08-03 13:05:52 +00:00 committed by android-build-merger
commit db8127a7e2
2 changed files with 7 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/hardware/bt_common_types.h
View file

@ -70,6 +70,7 @@ typedef struct
* the characteristic.
*/
uint8_t properties;
uint16_t permissions;
} btgatt_db_element_t;
#endif /* ANDROID_INCLUDE_BT_COMMON_TYPES_H */

46
include/hardware/bt_gatt_server.h
View file

@ -56,23 +56,7 @@ typedef void (*connection_callback)(int conn_id, int server_if, int connected,
/** Callback invoked in response to create_service */
typedef void (*service_added_callback)(int status, int server_if,
btgatt_srvc_id_t *srvc_id, int srvc_handle);
/** Callback indicating that an included service has been added to a service */
typedef void (*included_service_added_callback)(int status, int server_if,
int srvc_handle, int incl_srvc_handle);
/** Callback invoked when a characteristic has been added to a service */
typedef void (*characteristic_added_callback)(int status, int server_if,
bt_uuid_t *uuid, int srvc_handle, int char_handle);
/** Callback invoked when a descriptor has been added to a characteristic */
typedef void (*descriptor_added_callback)(int status, int server_if,
bt_uuid_t *uuid, int srvc_handle, int descr_handle);
/** Callback invoked in response to start_service */
typedef void (*service_started_callback)(int status, int server_if,
int srvc_handle);
vector<btgatt_db_element_t> service);
/** Callback invoked in response to stop_service */
typedef void (*service_stopped_callback)(int status, int server_if,
@ -127,14 +111,12 @@ typedef struct {
register_server_callback register_server_cb;
connection_callback connection_cb;
service_added_callback service_added_cb;
included_service_added_callback included_service_added_cb;
characteristic_added_callback characteristic_added_cb;
descriptor_added_callback descriptor_added_cb;
service_started_callback service_started_cb;
service_stopped_callback service_stopped_cb;
service_deleted_callback service_deleted_cb;
request_read_callback request_read_cb;
request_write_callback request_write_cb;
request_read_callback request_read_characteristic_cb;
request_read_callback request_read_descriptor_cb;
request_write_callback request_write_characteristic_cb;
request_write_callback request_write_descriptor_cb;
request_exec_write_callback request_exec_write_cb;
response_confirmation_callback response_confirmation_cb;
indication_sent_callback indication_sent_cb;
@ -159,23 +141,7 @@ typedef struct {
int conn_id );
/** Create a new service */
bt_status_t (*add_service)( int server_if, btgatt_srvc_id_t *srvc_id, int num_handles);
/** Assign an included service to it's parent service */
bt_status_t (*add_included_service)( int server_if, int service_handle, int included_handle);
/** Add a characteristic to a service */
bt_status_t (*add_characteristic)( int server_if,
int service_handle, bt_uuid_t *uuid,
int properties, int permissions);
/** Add a descriptor to a given service */
bt_status_t (*add_descriptor)(int server_if, int service_handle,
bt_uuid_t *uuid, int permissions);
/** Starts a local service */
bt_status_t (*start_service)(int server_if, int service_handle,
int transport);
bt_status_t (*add_service)(int server_if, vector<btgatt_db_element_t> service);
/** Stops a local service */
bt_status_t (*stop_service)(int server_if, int service_handle);