android/hid: Use BT_IO_OPT_SOURCE_BDADDR whenever possible
Luiz Augusto von Dentz
maintainerPATCH 1/2 android/hid: Use BT_IO_OPT_SOURCE_BDADDR whenever possible
From: Luiz Augusto von Dentz <[email protected]>
--- android/hid.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
android/hid.c +6 -3
@@ -661,12 +661,11 @@ void bt_hid_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf, uint16_t len)static void connect_cb (GIOChannel *chan,GError *err,gpointer user_data) {struct hid_device *dev; -bdaddr_t dst; +bdaddr_t src, dst;char address[18 ];uint16_t psm;GError *gerr =NULL ;GSList *l; -const bdaddr_t *src =bt_adapter_get_address ();uuid_t uuid;if (err) {
@@ -675,6 +674,7 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer user_data) }bt_io_get (chan, &err, +BT_IO_OPT_SOURCE_BDADDR , &src,BT_IO_OPT_DEST_BDADDR , &dst,BT_IO_OPT_PSM , &psm,BT_IO_OPT_INVALID );
@@ -699,7 +699,7 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer user_data) dev->uhid_fd =-1 ;bt_string2uuid (&uuid,HID_UUID ); -if (bt_search_service (src, &dev->dst, &uuid, +if (bt_search_service (&src, &dev->dst, &uuid, hid_sdp_search_cb, dev,NULL ) <0 ) {error ("failed to search sdp details" );hid_device_free (dev);
@@ -732,12 +732,14 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer user_data)bool bt_hid_register (GIOChannel *io,const bdaddr_t *addr) {GError *err =NULL ; +const bdaddr_t *src =bt_adapter_get_address ();DBG ("" ); notification_io =g_io_channel_ref (io); ctrl_io =bt_io_listen (connect_cb,NULL ,NULL ,NULL , &err, +BT_IO_OPT_SOURCE_BDADDR , &src,BT_IO_OPT_PSM ,L2CAP_PSM_HIDP_CTRL ,BT_IO_OPT_SEC_LEVEL ,BT_IO_SEC_LOW ,BT_IO_OPT_INVALID );
@@ -748,6 +750,7 @@ bool bt_hid_register(GIOChannel *io, const bdaddr_t *addr) } intr_io =bt_io_listen (connect_cb,NULL ,NULL ,NULL , &err, +BT_IO_OPT_SOURCE_BDADDR , &src,BT_IO_OPT_PSM ,L2CAP_PSM_HIDP_INTR ,BT_IO_OPT_SEC_LEVEL ,BT_IO_SEC_LOW ,BT_IO_OPT_INVALID );
Signature · 1 line
1.8.3.1
Luiz Augusto von Dentz
maintainerPATCH 2/2 android: Add the missing HAVE_CONFIG_H check daemon files
From: Luiz Augusto von Dentz <[email protected]>
--- android/hid.c | 4 ++++ android/ipc.c | 4 ++++ android/socket.c | 4 ++++ 3 files changed, 12 insertions(+)
android/hid.c +4 -0
@@ -21,6 +21,10 @@* */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include <stdint.h> #include <stdbool.h> #include <errno.h>
android/ipc.c +4 -0
@@ -21,6 +21,10 @@* */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include <stddef.h> #include <errno.h> #include <stdint.h>
android/socket.c +4 -0
@@ -21,6 +21,10 @@* */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include <glib.h> #include <stdbool.h>
Signature · 1 line
1.8.3.1
Hi Luiz,
Quoted 3 lines · Luiz Augusto von Dentz
--- android/hid.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
Both patches have been applied. Thanks.
Johan