Make bt_io_callback_t to take both source and destination.

7 files changed, 17 insertions, 13 deletions

diff --git a/audio/avdtp.c b/audio/avdtp.c
index 300898e2..7290578b 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -1508,7 +1508,8 @@ failed:
 	return FALSE;
 }
 
-static void l2cap_connect_cb(GIOChannel *chan, int err, gpointer user_data)
+static void l2cap_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
+			const bdaddr_t *dst, gpointer user_data)
 {
 	struct avdtp *session = user_data;
 	struct l2cap_options l2o;
diff --git a/audio/control.c b/audio/control.c
index 1777899e..6bf05bef 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -816,7 +816,8 @@ proceed:
 	return TRUE;
 }
 
-static void avctp_connect_cb(GIOChannel *chan, int err, gpointer data)
+static void avctp_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
+			const bdaddr_t *dst, gpointer data)
 {
 	struct avctp *session = data;
 	struct l2cap_options l2o;
diff --git a/audio/device.c b/audio/device.c
index b240bdae..120d45f3 100644
--- a/audio/device.c
+++ b/audio/device.c
@@ -72,7 +72,8 @@ static DBusHandlerResult device_get_address(DBusConnection *conn,
 	return send_message_and_unref(conn, reply);
 }
 
-static char *get_dev_name(DBusConnection *conn, bdaddr_t *src, bdaddr_t *bda)
+static char *get_dev_name(DBusConnection *conn, const bdaddr_t *src,
+			const bdaddr_t *bda)
 {
 	char address[18], filename[PATH_MAX + 1];
 
@@ -191,7 +192,7 @@ static void device_unregister(DBusConnection *conn, void *data)
 }
 
 struct device *device_register(DBusConnection *conn,
-					const char *path, bdaddr_t *bda)
+					const char *path, const bdaddr_t *bda)
 {
 	struct device *dev;
 	bdaddr_t src;
diff --git a/audio/device.h b/audio/device.h
index c5907075..44515bf4 100644
--- a/audio/device.h
+++ b/audio/device.h
@@ -70,7 +70,7 @@ struct device {
 };
 
 struct device *device_register(DBusConnection *conn,
-					const char *path, bdaddr_t *bda);
+					const char *path, const bdaddr_t *bda);
 
 int device_store(struct device *device, gboolean is_default);
 
diff --git a/audio/headset.c b/audio/headset.c
index 247d02d4..40a8a0d3 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -288,8 +288,8 @@ static unsigned int connect_cb_new(struct headset *hs,
 	return cb->id;
 }
 
-static void sco_connect_cb(GIOChannel *chan, int err,
-				gpointer user_data)
+static void sco_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
+			const bdaddr_t *dst, gpointer user_data)
 {
 	int sk;
 	struct device *dev = user_data;
@@ -675,7 +675,8 @@ static gboolean sco_cb(GIOChannel *chan, GIOCondition cond,
 	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 *dev = user_data;
 	struct headset *hs = dev->headset;
diff --git a/audio/manager.c b/audio/manager.c
index 15136b71..f09125f9 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -122,7 +122,7 @@ static struct enabled_interfaces enabled = {
 
 static DBusHandlerResult get_records(uuid_t *uuid, struct audio_sdp_data *data);
 
-static struct device *create_device(bdaddr_t *bda)
+static struct device *create_device(const bdaddr_t *bda)
 {
 	static int device_id = 0;
 	char path[128];
@@ -468,7 +468,7 @@ static DBusHandlerResult resolve_services(DBusMessage *msg,
 	return get_records(&uuid, sdp_data);
 }
 
-struct device *manager_device_connected(bdaddr_t *bda, const char *uuid)
+struct device *manager_device_connected(const bdaddr_t *bda, const char *uuid)
 {
 	struct device *device;
 	const char *path;
@@ -1726,7 +1726,7 @@ gboolean manager_authorize(bdaddr_t *dba, const char *uuid,
 	return TRUE;
 }
 
-struct device *manager_find_device(bdaddr_t *bda, const char *interface,
+struct device *manager_find_device(const bdaddr_t *bda, const char *interface,
 					gboolean connected)
 {
 	GSList *l;
diff --git a/audio/manager.h b/audio/manager.h
index c8f826ee..acc9c8e2 100644
--- a/audio/manager.h
+++ b/audio/manager.h
@@ -41,10 +41,10 @@ void audio_manager_exit(void);
 
 gboolean server_is_enabled(uint16_t svc);
 
-struct device *manager_find_device(bdaddr_t *bda, const char *interface,
+struct device *manager_find_device(const bdaddr_t *bda, const char *interface,
 					gboolean connected);
 
-struct device *manager_device_connected(bdaddr_t *bda, const char *uuid);
+struct device *manager_device_connected(const bdaddr_t *bda, const char *uuid);
 
 gboolean manager_create_device(bdaddr_t *bda, create_dev_cb_t cb,
 				void *user_data);