summaryrefslogtreecommitdiff
path: root/android/health.c
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2014-06-24 15:11:59 +0300
committerSzymon Janc <szymon.janc@tieto.com>2014-06-25 17:29:55 +0200
commit32180fa3a649ec26f9f3891a0ff5e4fe16592b91 (patch)
tree37adc3cf378f9f9fb4219784dbf5541ce399ef54 /android/health.c
parentc2cb1bf8c8c973e9610d6a9b2c87d77b7f9f6104 (diff)
downloadbluez-32180fa3a649ec26f9f3891a0ff5e4fe16592b91.tar.gz
android/health: Refactor setting mcl callbacks to function
Function will be used in other places as well.
Diffstat (limited to 'android/health.c')
-rw-r--r--android/health.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/android/health.c b/android/health.c
index a9287f633..c4df17a93 100644
--- a/android/health.c
+++ b/android/health.c
@@ -1252,6 +1252,18 @@ static int get_mdep(struct health_channel *channel)
get_mdep_cb, channel, NULL, 0);
}
+static bool set_mcl_cb(struct mcap_mcl *mcl, gpointer user_data, GError **err)
+{
+ return mcap_mcl_set_cb(mcl, user_data, err,
+ MCAP_MDL_CB_CONNECTED, mcap_mdl_connected_cb,
+ MCAP_MDL_CB_CLOSED, mcap_mdl_closed_cb,
+ MCAP_MDL_CB_DELETED, mcap_mdl_deleted_cb,
+ MCAP_MDL_CB_ABORTED, mcap_mdl_aborted_cb,
+ MCAP_MDL_CB_REMOTE_CONN_REQ, mcap_mdl_conn_req_cb,
+ MCAP_MDL_CB_REMOTE_RECONN_REQ, mcap_mdl_reconn_req_cb,
+ MCAP_MDL_CB_INVALID);
+}
+
static void create_mcl_cb(struct mcap_mcl *mcl, GError *err, gpointer data)
{
struct health_channel *channel = data;
@@ -1271,14 +1283,7 @@ static void create_mcl_cb(struct mcap_mcl *mcl, GError *err, gpointer data)
channel->dev->mcl_conn = true;
info("MCL connected");
- ret = mcap_mcl_set_cb(channel->dev->mcl, channel, &gerr,
- MCAP_MDL_CB_CONNECTED, mcap_mdl_connected_cb,
- MCAP_MDL_CB_CLOSED, mcap_mdl_closed_cb,
- MCAP_MDL_CB_DELETED, mcap_mdl_deleted_cb,
- MCAP_MDL_CB_ABORTED, mcap_mdl_aborted_cb,
- MCAP_MDL_CB_REMOTE_CONN_REQ, mcap_mdl_conn_req_cb,
- MCAP_MDL_CB_REMOTE_RECONN_REQ, mcap_mdl_reconn_req_cb,
- MCAP_MDL_CB_INVALID);
+ ret = set_mcl_cb(channel->dev->mcl, channel->dev, &gerr);
if (!ret) {
error("health: error setting mdl callbacks on mcl");
g_error_free(gerr);