From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ 06/12] android/avrcp-lib: Add support for parsing GetPlayerValueText PDU
Date: Mon, 17 Mar 2014 10:08:51 +0200 [thread overview]
Message-ID: <1395043737-8905-6-git-send-email-luiz.dentz@gmail.com> (raw)
In-Reply-To: <1395043737-8905-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
android/avrcp-lib.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
android/avrcp-lib.h | 6 ++++++
2 files changed, 64 insertions(+)
diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c
index 3275992..ad551cd 100644
--- a/android/avrcp-lib.c
+++ b/android/avrcp-lib.c
@@ -356,6 +356,61 @@ static ssize_t list_values(struct avrcp *session, uint8_t transaction,
player->user_data);
}
+static bool check_value(uint8_t attr, uint8_t number, const uint8_t *values)
+{
+ int i;
+
+ for (i = 0; i < number; i++) {
+ /* Check for invalid value */
+ switch (attr) {
+ case AVRCP_ATTRIBUTE_EQUALIZER:
+ if (values[i] < AVRCP_EQUALIZER_OFF ||
+ values[i] > AVRCP_EQUALIZER_ON)
+ return false;
+ case AVRCP_ATTRIBUTE_REPEAT_MODE:
+ if (values[i] < AVRCP_REPEAT_MODE_OFF ||
+ values[i] > AVRCP_REPEAT_MODE_GROUP)
+ return false;
+ case AVRCP_ATTRIBUTE_SHUFFLE:
+ if (values[i] < AVRCP_SHUFFLE_OFF ||
+ values[i] > AVRCP_SHUFFLE_GROUP)
+ return false;
+ case AVRCP_ATTRIBUTE_SCAN:
+ if (values[i] < AVRCP_SCAN_OFF ||
+ values[i] > AVRCP_SCAN_GROUP)
+ return false;
+ }
+ }
+
+ return true;
+}
+
+static ssize_t get_value_text(struct avrcp *session, uint8_t transaction,
+ uint16_t params_len, uint8_t *params,
+ void *user_data)
+{
+ struct avrcp_player *player = user_data;
+
+ DBG("");
+
+ if (params_len != 2 + params[1])
+ return -EINVAL;
+
+ if (params[0] > AVRCP_ATTRIBUTE_LAST ||
+ params[0] == AVRCP_ATTRIBUTE_ILEGAL)
+ return -EINVAL;
+
+ if (!check_value(params[0], params[1], ¶ms[2]))
+ return -EINVAL;
+
+ if (!player->ind || !player->ind->get_value_text)
+ return -ENOSYS;
+
+ return player->ind->get_value_text(session, transaction, params[0],
+ params[1], ¶ms[2],
+ player->user_data);
+}
+
static const struct avrcp_control_handler player_handlers[] = {
{ AVRCP_GET_CAPABILITIES,
AVC_CTYPE_STATUS, AVC_CTYPE_STABLE,
@@ -369,6 +424,9 @@ static const struct avrcp_control_handler player_handlers[] = {
{ AVRCP_LIST_PLAYER_VALUES,
AVC_CTYPE_STATUS, AVC_CTYPE_STABLE,
list_values },
+ { AVRCP_GET_PLAYER_VALUE_TEXT,
+ AVC_CTYPE_STATUS, AVC_CTYPE_STABLE,
+ get_value_text },
{ },
};
diff --git a/android/avrcp-lib.h b/android/avrcp-lib.h
index 2844000..b4ce2f4 100644
--- a/android/avrcp-lib.h
+++ b/android/avrcp-lib.h
@@ -130,6 +130,12 @@ struct avrcp_control_ind {
void *user_data);
int (*list_values) (struct avrcp *session, uint8_t transaction,
uint8_t attr, void *user_data);
+ int (*get_value_text) (struct avrcp *session, uint8_t transaction,
+ uint8_t attr, uint8_t number,
+ uint8_t *values, void *user_data);
+ int (*get_value) (struct avrcp *session, uint8_t transaction,
+ uint8_t number, uint8_t *attrs,
+ void *user_data);
};
struct avrcp_control_cfm {
--
1.8.5.3
next prev parent reply other threads:[~2014-03-17 8:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-17 8:08 [PATCH BlueZ 01/12] android/avrcp-lib: Change API to register callbacks instead of PDU handlers Luiz Augusto von Dentz
2014-03-17 8:08 ` [PATCH BlueZ 02/12] android/avrcp-lib: Add support for parsing GetCapabilities PDU Luiz Augusto von Dentz
2014-03-17 8:42 ` Andrei Emeltchenko
2014-03-17 9:25 ` Luiz Augusto von Dentz
2014-03-17 8:08 ` [PATCH BlueZ 03/12] android/avrcp-lib: Add support for parsing ListPlayerAttributes PDU Luiz Augusto von Dentz
2014-03-17 8:47 ` Andrei Emeltchenko
2014-03-17 8:54 ` Andrei Emeltchenko
2014-03-17 8:08 ` [PATCH BlueZ 04/12] android/avrcp-lib: Add support for parsing GetPlayerAttributeText PDU Luiz Augusto von Dentz
2014-03-17 8:08 ` [PATCH BlueZ 05/12] android/avrcp-lib: Add support for parsing ListPlayerValues PDU Luiz Augusto von Dentz
2014-03-17 8:08 ` Luiz Augusto von Dentz [this message]
2014-03-17 8:08 ` [PATCH BlueZ 07/12] android/avrcp-lib: Add support for parsing GetCurrentPlayerValue PDU Luiz Augusto von Dentz
2014-03-17 8:08 ` [PATCH BlueZ 08/12] android/avrcp-lib: Add support for parsing SetPlayerValue PDU Luiz Augusto von Dentz
2014-03-17 8:08 ` [PATCH BlueZ 09/12] android/avrcp-lib: Add support for parsing GetPlayStatus PDU Luiz Augusto von Dentz
2014-03-17 8:08 ` [PATCH BlueZ 10/12] android/avrcp-lib: Add support for parsing GetElementAttributes PDU Luiz Augusto von Dentz
2014-03-17 8:08 ` [PATCH BlueZ 11/12] android/avrcp-lib: Add support for parsing ResgisterNotification PDU Luiz Augusto von Dentz
2014-03-17 8:08 ` [PATCH BlueZ 12/12] android/avrcp-lib: Add support for parsing SetAddressedPlayer PDU Luiz Augusto von Dentz
2014-03-17 8:38 ` [PATCH BlueZ 01/12] android/avrcp-lib: Change API to register callbacks instead of PDU handlers Andrei Emeltchenko
2014-03-17 9:22 ` Luiz Augusto von Dentz
2014-03-17 13:01 ` Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395043737-8905-6-git-send-email-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox