Make bt_io_callback_t to take both source and destination.

2 files changed, 11 insertions, 5 deletions

diff --git a/input/device.c b/input/device.c
index 131e626d..04cabb0f 100644
--- a/input/device.c
+++ b/input/device.c
@@ -371,7 +371,8 @@ failed:
 	return FALSE;
 }
 
-static void rfcomm_connect_cb(GIOChannel *chan, int err, gpointer user_data)
+static void rfcomm_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
+			const bdaddr_t *dst, gpointer user_data)
 {
 	struct device *idev = user_data;
 	struct fake_input *fake;
@@ -553,7 +554,8 @@ cleanup:
 	return err;
 }
 
-static void interrupt_connect_cb(GIOChannel *chan, int err, gpointer user_data)
+static void interrupt_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
+			const bdaddr_t *dst, gpointer user_data)
 {
 	struct device *idev = user_data;
 
@@ -594,7 +596,8 @@ cleanup:
 	idev->pending_connect = NULL;
 }
 
-static void control_connect_cb(GIOChannel *chan, int err, gpointer user_data)
+static void control_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
+			const bdaddr_t *dst, gpointer user_data)
 {
 	struct device *idev = user_data;
 
diff --git a/input/manager.c b/input/manager.c
index 13ca178d..9ed1f195 100644
--- a/input/manager.c
+++ b/input/manager.c
@@ -212,7 +212,9 @@ static void extract_pnp_record(sdp_record_t *rec, struct hidp_connadd_req *req)
 	req->version = pdlist ? pdlist->val.uint16 : 0x0000;
 }
 
-static void interrupt_connect_cb(GIOChannel *chan, int err, gpointer user_data)
+static void interrupt_connect_cb(GIOChannel *chan, int err,
+			const bdaddr_t *src, const bdaddr_t *dst,
+			gpointer user_data)
 {
 	struct pending_req *pr = user_data;
 	struct hidp_connadd_req hidp;
@@ -272,7 +274,8 @@ cleanup:
 		g_free(hidp.rd_data);
 }
 
-static void control_connect_cb(GIOChannel *chan, int err, gpointer user_data)
+static void control_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
+			const bdaddr_t *dst, gpointer user_data)
 {
 	struct pending_req *pr = user_data;