Support for decoding AVRCP GetCurrentPlayerApplicationSettingValue
added in Bluetooth monitor.
---
monitor/avctp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/monitor/avctp.c b/monitor/avctp.c
index 5543a49..936c40d 100644
--- a/monitor/avctp.c
+++ b/monitor/avctp.c
@@ -611,6 +611,54 @@ response:
return true;
}
+static bool avrcp_get_current_player_value(struct l2cap_frame *frame,
+ uint8_t ctype, uint8_t len,
+ uint8_t indent)
+{
+ uint8_t num;
+
+ if (!l2cap_frame_get_u8(frame, &num))
+ return false;
+
+ if (ctype > AVC_CTYPE_GENERAL_INQUIRY)
+ goto response;
+
+ print_field("%*cAttributeCount: 0x%02x", (indent - 8), ' ', num);
+
+ for (; num > 0; num--) {
+ uint8_t attr;
+
+ if (!l2cap_frame_get_u8(frame, &attr))
+ return false;
+
+ print_field("%*cAttributeID: 0x%02x (%s)", (indent - 8),
+ ' ', attr, attr2str(attr));
+ }
+
+ return true;
+
+response:
+ print_field("%*cValueCount: 0x%02x", (indent - 8), ' ', num);
+
+ for (; num > 0; num--) {
+ uint8_t attr, value;
+
+ if (!l2cap_frame_get_u8(frame, &attr))
+ return false;
+
+ print_field("%*cAttributeID: 0x%02x (%s)", (indent - 8),
+ ' ', attr, attr2str(attr));
+
+ if (!l2cap_frame_get_u8(frame, &value))
+ return false;
+
+ print_field("%*cValueID: 0x%02x (%s)", (indent - 8),
+ ' ', value, value2str(attr, value));
+ }
+
+ return true;
+}
+
struct avrcp_ctrl_pdu_data {
uint8_t pduid;
bool (*func) (struct l2cap_frame *frame, uint8_t ctype, uint8_t len,
@@ -621,6 +669,7 @@ static const struct avrcp_ctrl_pdu_data avrcp_ctrl_pdu_table[] = {
{ 0x10, avrcp_get_capabilities },
{ 0x11, avrcp_list_player_attributes },
{ 0x12, avrcp_list_player_values },
+ { 0x13, avrcp_get_current_player_value },
{ }
};
--
1.9.1
Support for decoding AVRCP InformDisplayableCharacterSet added in
Bluetooth monitor.
---
monitor/avctp.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/monitor/avctp.c b/monitor/avctp.c
index 1bfd9cf..28e1f34 100644
--- a/monitor/avctp.c
+++ b/monitor/avctp.c
@@ -863,6 +863,32 @@ response:
return true;
}
+static bool avrcp_displayable_charset(struct l2cap_frame *frame, uint8_t ctype,
+ uint8_t len, uint8_t indent)
+{
+ uint8_t num;
+
+ if (ctype > AVC_CTYPE_GENERAL_INQUIRY)
+ return true;
+
+ if (!l2cap_frame_get_u8(frame, &num))
+ return false;
+
+ print_field("%*cCharsetCount: 0x%02x", (indent - 8), ' ', num);
+
+ for (; num > 0; num--) {
+ uint16_t charset;
+
+ if (!l2cap_frame_get_be16(frame, &charset))
+ return false;
+
+ print_field("%*cCharsetID: 0x%04x (%s)", (indent - 8),
+ ' ', charset, charset2str(charset));
+ }
+
+ return true;
+}
+
struct avrcp_ctrl_pdu_data {
uint8_t pduid;
bool (*func) (struct l2cap_frame *frame, uint8_t ctype, uint8_t len,
@@ -877,6 +903,7 @@ static const struct avrcp_ctrl_pdu_data avrcp_ctrl_pdu_table[] = {
{ 0x14, avrcp_set_player_value },
{ 0x15, avrcp_get_player_attribute_text },
{ 0x16, avrcp_get_player_value_text },
+ { 0x17, avrcp_displayable_charset },
{ }
};
--
1.9.1
Support for decoding AVRCP GetPlayerApplicationSettingValueText
added in Bluetooth monitor.
---
monitor/avctp.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/monitor/avctp.c b/monitor/avctp.c
index 3e02676..1bfd9cf 100644
--- a/monitor/avctp.c
+++ b/monitor/avctp.c
@@ -788,6 +788,81 @@ response:
return true;
}
+static bool avrcp_get_player_value_text(struct l2cap_frame *frame,
+ uint8_t ctype, uint8_t len,
+ uint8_t indent)
+{
+ static uint8_t attr = 0;
+ uint8_t num;
+
+ if (ctype > AVC_CTYPE_GENERAL_INQUIRY)
+ goto response;
+
+ if (!l2cap_frame_get_u8(frame, &attr))
+ return false;
+
+ print_field("%*cAttributeID: 0x%02x (%s)", (indent - 8), ' ',
+ attr, attr2str(attr));
+
+ if (!l2cap_frame_get_u8(frame, &num))
+ return false;
+
+ print_field("%*cValueCount: 0x%02x", (indent - 8), ' ', num);
+
+ for (; num > 0; num--) {
+ uint8_t value;
+
+ if (!l2cap_frame_get_u8(frame, &value))
+ return false;
+
+ print_field("%*cValueID: 0x%02x (%s)", (indent - 8),
+ ' ', value, value2str(attr, value));
+ }
+
+ return true;
+
+response:
+ if (!l2cap_frame_get_u8(frame, &num))
+ return false;
+
+ print_field("%*cValueCount: 0x%02x", (indent - 8), ' ', num);
+
+ for (; num > 0; num--) {
+ uint8_t value, len;
+ uint16_t charset;
+
+ if (!l2cap_frame_get_u8(frame, &value))
+ return false;
+
+ print_field("%*cValueID: 0x%02x (%s)", (indent - 8), ' ',
+ value, value2str(attr, value));
+
+ if (!l2cap_frame_get_be16(frame, &charset))
+ return false;
+
+ print_field("%*cCharsetIDID: 0x%02x (%s)", (indent - 8), ' ',
+ charset, charset2str(charset));
+
+ if (!l2cap_frame_get_u8(frame, &len))
+ return false;
+
+ print_field("%*cStringLength: 0x%02x", (indent - 8), ' ', len);
+
+ printf("String: ");
+ for (; len > 0; len--) {
+ uint8_t c;
+
+ if (!l2cap_frame_get_u8(frame, &c))
+ return false;
+
+ printf("%1c", isprint(c) ? c : '.');
+ }
+ printf("\n");
+ }
+
+ return true;
+}
+
struct avrcp_ctrl_pdu_data {
uint8_t pduid;
bool (*func) (struct l2cap_frame *frame, uint8_t ctype, uint8_t len,
@@ -801,6 +876,7 @@ static const struct avrcp_ctrl_pdu_data avrcp_ctrl_pdu_table[] = {
{ 0x13, avrcp_get_current_player_value },
{ 0x14, avrcp_set_player_value },
{ 0x15, avrcp_get_player_attribute_text },
+ { 0x16, avrcp_get_player_value_text },
{ }
};
--
1.9.1
Support for decoding AVRCP GetPlayerApplicationSettingAttributeText
added in Bluetooth monitor.
---
monitor/avctp.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 98 insertions(+)
diff --git a/monitor/avctp.c b/monitor/avctp.c
index d7476a4..3e02676 100644
--- a/monitor/avctp.c
+++ b/monitor/avctp.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
#include <inttypes.h>
#include <bluetooth/bluetooth.h>
@@ -483,6 +484,39 @@ static const char *value2str(uint8_t attr, uint8_t value)
}
}
+static const char *charset2str(uint16_t charset)
+{
+ switch (charset) {
+ case 1:
+ case 2:
+ return "Reserved";
+ case 3:
+ return "ASCII";
+ case 4:
+ return "ISO_8859-1";
+ case 5:
+ return "ISO_8859-2";
+ case 6:
+ return "ISO_8859-3";
+ case 7:
+ return "ISO_8859-4";
+ case 8:
+ return "ISO_8859-5";
+ case 9:
+ return "ISO_8859-6";
+ case 10:
+ return "ISO_8859-7";
+ case 11:
+ return "ISO_8859-8";
+ case 12:
+ return "ISO_8859-9";
+ case 106:
+ return "UTF-8";
+ default:
+ return "Unknown";
+ }
+}
+
static bool avrcp_passthrough_packet(struct l2cap_frame *frame)
{
packet_hexdump(frame->data, frame->size);
@@ -691,6 +725,69 @@ static bool avrcp_set_player_value(struct l2cap_frame *frame, uint8_t ctype,
return true;
}
+static bool avrcp_get_player_attribute_text(struct l2cap_frame *frame,
+ uint8_t ctype, uint8_t len,
+ uint8_t indent)
+{
+ uint8_t num;
+
+ if (!l2cap_frame_get_u8(frame, &num))
+ return false;
+
+ print_field("%*cAttributeCount: 0x%02x", (indent - 8), ' ', num);
+
+ if (ctype > AVC_CTYPE_GENERAL_INQUIRY)
+ goto response;
+
+ for (; num > 0; num--) {
+ uint8_t attr;
+
+ if (!l2cap_frame_get_u8(frame, &attr))
+ return false;
+
+ print_field("%*cAttributeID: 0x%02x (%s)", (indent - 8),
+ ' ', attr, attr2str(attr));
+ }
+
+ return true;
+
+response:
+ for (; num > 0; num--) {
+ uint8_t attr, len;
+ uint16_t charset;
+
+ if (!l2cap_frame_get_u8(frame, &attr))
+ return false;
+
+ print_field("%*cAttributeID: 0x%02x (%s)", (indent - 8),
+ ' ', attr, attr2str(attr));
+
+ if (!l2cap_frame_get_be16(frame, &charset))
+ return false;
+
+ print_field("%*cCharsetID: 0x%04x (%s)", (indent - 8),
+ ' ', charset, charset2str(charset));
+
+ if (!l2cap_frame_get_u8(frame, &len))
+ return false;
+
+ print_field("%*cStringLength: 0x%02x", (indent - 8), ' ', len);
+
+ printf("String: ");
+ for (; len > 0; len--) {
+ uint8_t c;
+
+ if (!l2cap_frame_get_u8(frame, &c))
+ return false;
+
+ printf("%1c", isprint(c) ? c : '.');
+ }
+ printf("\n");
+ }
+
+ return true;
+}
+
struct avrcp_ctrl_pdu_data {
uint8_t pduid;
bool (*func) (struct l2cap_frame *frame, uint8_t ctype, uint8_t len,
@@ -703,6 +800,7 @@ static const struct avrcp_ctrl_pdu_data avrcp_ctrl_pdu_table[] = {
{ 0x12, avrcp_list_player_values },
{ 0x13, avrcp_get_current_player_value },
{ 0x14, avrcp_set_player_value },
+ { 0x15, avrcp_get_player_attribute_text },
{ }
};
--
1.9.1
Support for decoding AVRCP SetPlayerApplicationSettingValue
added in Bluetooth monitor.
---
monitor/avctp.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/monitor/avctp.c b/monitor/avctp.c
index 936c40d..d7476a4 100644
--- a/monitor/avctp.c
+++ b/monitor/avctp.c
@@ -659,6 +659,38 @@ response:
return true;
}
+static bool avrcp_set_player_value(struct l2cap_frame *frame, uint8_t ctype,
+ uint8_t len, uint8_t indent)
+{
+ uint8_t num;
+
+ if (ctype > AVC_CTYPE_GENERAL_INQUIRY)
+ return true;
+
+ if (!l2cap_frame_get_u8(frame, &num))
+ return false;
+
+ print_field("%*cAttributeCount: 0x%02x", (indent - 8), ' ', num);
+
+ for (; num > 0; num--) {
+ uint8_t attr, value;
+
+ if (!l2cap_frame_get_u8(frame, &attr))
+ return false;
+
+ print_field("%*cAttributeID: 0x%02x (%s)", (indent - 8), ' ',
+ attr, attr2str(attr));
+
+ if (!l2cap_frame_get_u8(frame, &value))
+ return false;
+
+ print_field("%*cValueID: 0x%02x (%s)", (indent - 8), ' ',
+ value, value2str(attr, value));
+ }
+
+ return true;
+}
+
struct avrcp_ctrl_pdu_data {
uint8_t pduid;
bool (*func) (struct l2cap_frame *frame, uint8_t ctype, uint8_t len,
@@ -670,6 +702,7 @@ static const struct avrcp_ctrl_pdu_data avrcp_ctrl_pdu_table[] = {
{ 0x11, avrcp_list_player_attributes },
{ 0x12, avrcp_list_player_values },
{ 0x13, avrcp_get_current_player_value },
+ { 0x14, avrcp_set_player_value },
{ }
};
--
1.9.1