mirrors
/
gattlib
mirror of https://github.com/labapart/gattlib
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed build for Bluez v4.101

pull/21/head
Olivier Martin 2017-03-17 11:35:13 +01:00
parent a40b8f9724
commit 0ee021f531
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bluez/bluez4/btio/btio.h
View File

@ -73,6 +73,13 @@ typedef enum {
BT_IO_OPT_TIMEOUT
} BtIOOption;
typedef enum {
BT_IO_SEC_SDP = 0,
BT_IO_SEC_LOW,
BT_IO_SEC_MEDIUM,
BT_IO_SEC_HIGH,
} BtIOSecLevel;
typedef enum {
BT_IO_MODE_BASIC = 0,
BT_IO_MODE_RETRANS,

1
bluez/gattlib_adapter.c
View File

@ -1,6 +1,7 @@
#include "gattlib_internal.h"
#include <poll.h>
#include <stdlib.h>
#include <unistd.h>
#include <bluetooth/bluetooth.h>

5
bluez/gattlib_discover.c
View File

@ -191,7 +191,6 @@ static void char_desc_cb(guint8 status, const guint8 *pdu, guint16 plen, gpointe
data->descriptors = malloc(data->descriptors_count * sizeof(gattlib_descriptor_t));
for (i = 0; i < list->num; i++) {
uint16_t handle;
uint8_t *value;
bt_uuid_t uuid;
@ -205,7 +204,7 @@ static void char_desc_cb(guint8 status, const guint8 *pdu, guint16 plen, gpointe
uuid = att_get_uuid128(&value[2]);
}
bt_uuid_to_string(&uuid, data->descriptors[i].uuid, MAX_LEN_UUID_STR);
bt_uuid_to_uuid(&uuid, &data->descriptors[i].uuid);
assert(i < data->descriptors_count);
}
@ -254,7 +253,7 @@ int gattlib_discover_desc_range(gatt_connection_t* connection, int start, int en
bzero(&descriptor_data, sizeof(descriptor_data));
#if BLUEZ_VERSION_MAJOR == 4
ret = gatt_find_info(connection->attrib, start, end, char_desc_cb, &descriptor_data);
ret = gatt_find_info(conn_context->attrib, start, end, char_desc_cb, &descriptor_data);
#else
ret = gatt_discover_desc(conn_context->attrib, start, end, NULL, char_desc_cb, &descriptor_data);
#endif

2
bluez/gattlib_read_write.c
View File

@ -170,7 +170,7 @@ int gattlib_write_char_by_handle(gatt_connection_t* connection, uint16_t handle,
gattlib_context_t* conn_context = connection->context;
int write_completed = FALSE;
guint ret = gatt_write_char(conn_context->attrib, handle, buffer, buffer_len,
guint ret = gatt_write_char(conn_context->attrib, handle, (void*)buffer, buffer_len,
gattlib_write_result_cb, &write_completed);
if (ret == 0) {
return 1;