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

bluez5: Replaced 'g_io_add_watch_full' by 'gattlib_watch_connection_full'

pull/8/head
Olivier Martin 2017-01-31 22:19:17 +01:00
parent f1aa5b0ede
commit 751ea82bda
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bluez5/btio/btio.c
View File

@ -42,6 +42,7 @@
#include "lib/sco.h"
#include "btio.h"
#include "gattlib_internal.h"
#ifndef BT_FLUSHABLE
#define BT_FLUSHABLE 8
@ -283,7 +284,7 @@ static void server_add(GIOChannel *io, BtIOConnect connect,
server->destroy = destroy;
cond = G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL;
g_io_add_watch_full(io, G_PRIORITY_DEFAULT, cond, server_cb, server,
gattlib_watch_connection_full(io, cond, server_cb, server,
(GDestroyNotify) server_remove);
}
@ -299,7 +300,7 @@ static void connect_add(GIOChannel *io, BtIOConnect connect,
conn->destroy = destroy;
cond = G_IO_OUT | G_IO_ERR | G_IO_HUP | G_IO_NVAL;
g_io_add_watch_full(io, G_PRIORITY_DEFAULT, cond, connect_cb, conn,
gattlib_watch_connection_full(io, cond, connect_cb, conn,
(GDestroyNotify) connect_remove);
}
@ -315,7 +316,7 @@ static void accept_add(GIOChannel *io, BtIOConnect connect, gpointer user_data,
accept->destroy = destroy;
cond = G_IO_OUT | G_IO_ERR | G_IO_HUP | G_IO_NVAL;
g_io_add_watch_full(io, G_PRIORITY_DEFAULT, cond, accept_cb, accept,
gattlib_watch_connection_full(io, cond, accept_cb, accept,
(GDestroyNotify) accept_remove);
}

21
bluez5/src/shared/io-glib.c
View File

@ -30,10 +30,11 @@
#include <glib.h>
#include "src/shared/io.h"
#include "gattlib_internal.h"
struct io_watch {
struct io *io;
guint id;
GSource* id;
io_callback_func_t callback;
io_destroy_func_t destroy;
void *user_data;
@ -114,17 +115,17 @@ void io_destroy(struct io *io)
return;
if (io->read_watch) {
g_source_remove(io->read_watch->id);
g_source_destroy(io->read_watch->id);
io->read_watch = NULL;
}
if (io->write_watch) {
g_source_remove(io->write_watch->id);
g_source_destroy(io->write_watch->id);
io->write_watch = NULL;
}
if (io->disconnect_watch) {
g_source_remove(io->disconnect_watch->id);
g_source_destroy(io->disconnect_watch->id);
io->disconnect_watch = NULL;
}
@ -189,11 +190,11 @@ static struct io_watch *watch_new(struct io *io, GIOCondition cond,
watch->destroy = destroy;
watch->user_data = user_data;
watch->id = g_io_add_watch_full(io->channel, G_PRIORITY_DEFAULT,
cond | G_IO_ERR | G_IO_NVAL,
watch_callback, watch,
watch_destroy);
if (watch->id == 0) {
watch->id = gattlib_watch_connection_full(io->channel,
cond | G_IO_ERR | G_IO_NVAL,
watch_callback, watch,
watch_destroy);
if (watch->id == NULL) {
watch_destroy(watch);
return NULL;
}
@ -228,7 +229,7 @@ static bool io_set_handler(struct io *io, GIOCondition cond,
}
if (*watch) {
g_source_remove((*watch)->id);
g_source_destroy((*watch)->id);
*watch = NULL;
}