avctp: Fix using L2CAP modes with bt_io
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Mon, 8 Jun 2020 16:18:50 +0000 (09:18 -0700)
committerAyush Garg <ayush.garg@samsung.com>
Mon, 12 Apr 2021 09:00:49 +0000 (14:30 +0530)
bt_io modes are no longer compatible with L2CAP modes so the later
shall not used with bt_io APIs.

Signed-off-by: Anuj Jain <anuj01.jain@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>
profiles/audio/avctp.c

index 0d54f19..da0cb3d 100644 (file)
@@ -1743,7 +1743,7 @@ int avctp_register(struct btd_adapter *adapter, gboolean master)
 
        server = g_new0(struct avctp_server, 1);
 
-       server->control_io = avctp_server_socket(src, master, L2CAP_MODE_BASIC,
+       server->control_io = avctp_server_socket(src, master, BT_IO_MODE_BASIC,
                                                        AVCTP_CONTROL_PSM);
        if (!server->control_io) {
                g_free(server);
@@ -1752,7 +1752,7 @@ int avctp_register(struct btd_adapter *adapter, gboolean master)
 
 /* Tizen doesn't support AVRCP BROWSING CHANNEL */
 #ifndef TIZEN_FEATURE_BLUEZ_MODIFY
-       server->browsing_io = avctp_server_socket(src, master, L2CAP_MODE_ERTM,
+       server->browsing_io = avctp_server_socket(src, master, BT_IO_MODE_ERTM,
                                                        AVCTP_BROWSING_PSM);
        if (!server->browsing_io) {
                if (server->control_io) {
@@ -2347,7 +2347,7 @@ int avctp_connect_browsing(struct avctp *session)
                                device_get_address(session->device),
                                BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM,
                                BT_IO_OPT_PSM, AVCTP_BROWSING_PSM,
-                               BT_IO_OPT_MODE, L2CAP_MODE_ERTM,
+                               BT_IO_OPT_MODE, BT_IO_MODE_ERTM,
                                BT_IO_OPT_INVALID);
        if (err) {
                error("%s", err->message);