summaryrefslogtreecommitdiff
path: root/profiles/audio
diff options
context:
space:
mode:
authorparas.kumar <paras.kumar@samsung.com>2016-03-17 18:35:25 +0530
committerparas.kumar <paras.kumar@samsung.com>2016-03-17 18:53:28 +0530
commitdb3b4bfc30ff4befbe4b8424b1dabc2e39220997 (patch)
tree2236497147d8ee3d9a35eedeb436f2f873eafd5d /profiles/audio
parentd2a9269b0aaa15ff8b22e1d383442a291ec0d5e2 (diff)
downloadbluez-db3b4bfc30ff4befbe4b8424b1dabc2e39220997.tar.gz
bluez-db3b4bfc30ff4befbe4b8424b1dabc2e39220997.tar.bz2
bluez-db3b4bfc30ff4befbe4b8424b1dabc2e39220997.zip
Fix BlueZ build warnings
Change-Id: I6260861c45448f149ff25fe8d50eaa4251b813aa Signed-off-by: paras.kumar <paras.kumar@samsung.com>
Diffstat (limited to 'profiles/audio')
-rw-r--r--profiles/audio/a2dp.c2
-rw-r--r--profiles/audio/avdtp.c7
-rw-r--r--profiles/audio/avrcp.c24
3 files changed, 30 insertions, 3 deletions
diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index ef816144..84786dec 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -1759,6 +1759,7 @@ done:
finalize_select(setup);
}
+#ifndef __TIZEN_PATCH__
static gboolean check_vendor_codec(struct a2dp_sep *sep, uint8_t *cap,
size_t len)
{
@@ -1794,6 +1795,7 @@ static gboolean check_vendor_codec(struct a2dp_sep *sep, uint8_t *cap,
return TRUE;
}
+#endif
static struct a2dp_sep *a2dp_find_sep(struct avdtp *session, GSList *list,
const char *sender)
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 92bd5612..0ba00b3d 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -1074,11 +1074,12 @@ static void avdtp_sep_set_state(struct avdtp *session,
avdtp_state_t state)
{
struct avdtp_stream *stream = sep->stream;
- bdaddr_t *dst;
#ifdef __TIZEN_PATCH__
+#if defined(__BROADCOM_QOS_PATCH__) || defined(TIZEN_WEARABLE)
+ bdaddr_t *dst;
+
dst = (bdaddr_t*)device_get_address(session->device);
-#else
- dst = device_get_address(session->device);
+#endif
#endif
avdtp_state_t old_state;
struct avdtp_error err, *err_ptr = NULL;
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 911a8895..a1e14114 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -255,11 +255,21 @@ struct control_pdu_handler {
};
static GSList *servers = NULL;
+#if defined(SUPPORT_AVRCP_TARGET) || defined(SUPPORT_AVRCP_CONTROL)
static unsigned int avctp_id = 0;
+#endif
+
+#ifdef SUPPORT_AVRCP_TARGET
#ifdef __TIZEN_PATCH__
static uint16_t adapter_avrcp_tg_ver = 0;
+#endif
+#endif
+
+#ifdef SUPPORT_AVRCP_CONTROL
+#ifdef __TIZEN_PATCH__
static uint16_t adapter_avrcp_ct_ver = 0;
#endif
+#endif
/* Company IDs supported by this device */
static uint32_t company_ids[] = {
@@ -1523,6 +1533,7 @@ static const struct passthrough_handler passthrough_handlers[] = {
{ },
};
+#if defined(SUPPORT_AVRCP_TARGET) || defined(SUPPORT_AVRCP_CONTROL)
static bool handle_passthrough(struct avctp *conn, uint8_t op, bool pressed,
void *user_data)
{
@@ -1544,6 +1555,7 @@ static bool handle_passthrough(struct avctp *conn, uint8_t op, bool pressed,
return handler->func(session);
}
+#endif
#ifdef __TIZEN_PATCH__
void avrcp_stop_position_timer(void)
@@ -1830,6 +1842,7 @@ static const struct control_pdu_handler control_handlers[] = {
{ },
};
+#if defined(SUPPORT_AVRCP_TARGET) || defined(SUPPORT_AVRCP_CONTROL)
/* handle vendordep pdu inside an avctp packet */
static size_t handle_vendordep_pdu(struct avctp *conn, uint8_t transaction,
uint8_t *code, uint8_t *subunit,
@@ -1896,6 +1909,7 @@ static struct browsing_pdu_handler {
} browsing_handlers[] = {
{ },
};
+#endif
size_t avrcp_browsing_general_reject(uint8_t *operands)
{
@@ -1910,6 +1924,7 @@ size_t avrcp_browsing_general_reject(uint8_t *operands)
return AVRCP_BROWSING_HEADER_LENGTH + sizeof(status);
}
+#if defined(SUPPORT_AVRCP_TARGET) || defined(SUPPORT_AVRCP_CONTROL)
static size_t handle_browsing_pdu(struct avctp *conn,
uint8_t transaction, uint8_t *operands,
size_t operand_count, void *user_data)
@@ -1933,6 +1948,7 @@ done:
handler->func(session, pdu, transaction);
return AVRCP_BROWSING_HEADER_LENGTH + ntohs(pdu->param_len);
}
+#endif
size_t avrcp_handle_vendor_reject(uint8_t *code, uint8_t *operands)
{
@@ -2091,6 +2107,7 @@ static gboolean avrcp_player_value_rsp(struct avctp *conn,
return FALSE;
}
+#if defined(SUPPORT_AVRCP_TARGET) || defined(SUPPORT_AVRCP_CONTROL)
static void avrcp_get_current_player_value(struct avrcp *session,
uint8_t *attrs, uint8_t count)
{
@@ -2164,6 +2181,7 @@ static void avrcp_list_player_attributes(struct avrcp *session)
avrcp_list_player_attributes_rsp,
session);
}
+#endif
static void avrcp_parse_attribute_list(struct avrcp_player *player,
uint8_t *operands, uint8_t count)
@@ -3407,6 +3425,7 @@ static void avrcp_register_notification(struct avrcp *session, uint8_t event)
avrcp_handle_event, session);
}
+#if defined(SUPPORT_AVRCP_TARGET) || defined(SUPPORT_AVRCP_CONTROL)
static gboolean avrcp_get_capabilities_resp(struct avctp *conn,
uint8_t code, uint8_t subunit,
uint8_t *operands, size_t operand_count,
@@ -3489,6 +3508,7 @@ static void avrcp_get_capabilities(struct avrcp *session)
avrcp_get_capabilities_resp,
session);
}
+#endif
static struct avrcp *find_session(GSList *list, struct btd_device *dev)
{
@@ -3502,6 +3522,7 @@ static struct avrcp *find_session(GSList *list, struct btd_device *dev)
return NULL;
}
+#if defined(SUPPORT_AVRCP_TARGET) || defined(SUPPORT_AVRCP_CONTROL)
static void destroy_browsing(void *data)
{
struct avrcp *session = data;
@@ -3575,6 +3596,7 @@ static void avrcp_connect_browsing(struct avrcp *session)
connect_browsing,
session);
}
+#endif
#ifdef SUPPORT_AVRCP_TARGET
static void target_init(struct avrcp *session)
@@ -3692,6 +3714,7 @@ static void controller_init(struct avrcp *session)
}
#endif
+#if defined(SUPPORT_AVRCP_TARGET) || defined(SUPPORT_AVRCP_CONTROL)
static void session_init_control(struct avrcp *session)
{
session->passthrough_id = avctp_register_passthrough_handler(
@@ -3884,6 +3907,7 @@ static void avrcp_server_unregister(struct avrcp_server *server)
avctp_id = 0;
}
}
+#endif
struct avrcp_player *avrcp_register_player(struct btd_adapter *adapter,
struct avrcp_player_cb *cb,