2012-08-03 09:43:23

by Vani-dineshbhai PATEL X

Subject: [PATCH BlueZ V2 4/5]AVRCP: Register/Unregister Browsing handler

From: Vani Patel <[email protected]>

Add functions to register and unregister Browsing
handler
---
audio/avctp.c | 28 ++++++++++++++++++++++++++++
audio/avctp.h | 8 ++++++++
2 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/audio/avctp.c b/audio/avctp.c
index f4f5afa..0671f17 100644
--- a/audio/avctp.c
+++ b/audio/avctp.c
@@ -157,6 +157,12 @@ struct avctp_pdu_handler {
unsigned int id;
};

+struct avctp_browsing_pdu_handler {
+ avctp_browsing_pdu_cb cb;
+ void *user_data;
+ unsigned int id;
+};
+
static struct {
const char *name;
uint8_t avc;
@@ -176,6 +182,7 @@ static GSList *callbacks = NULL;
static GSList *servers = NULL;
static GSList *control_handlers = NULL;
static uint8_t id = 0;
+static struct avctp_browsing_pdu_handler *browsing_handler = NULL;

static void auth_cb(DBusError *derr, void *user_data);

@@ -1245,6 +1252,19 @@ unsigned int avctp_register_pdu_handler(uint8_t opcode, avctp_control_pdu_cb cb,
return handler->id;
}

+unsigned int avctp_register_browsing_pdu_handler(avctp_browsing_pdu_cb cb,
+ void *user_data)
+{
+ static unsigned int id = 0;
+
+ browsing_handler = g_new(struct avctp_browsing_pdu_handler, 1);
+ browsing_handler->cb = cb;
+ browsing_handler->user_data = user_data;
+ browsing_handler->id = ++id;
+
+ return browsing_handler->id;
+}
+
gboolean avctp_unregister_pdu_handler(unsigned int id)
{
GSList *l;
@@ -1263,6 +1283,14 @@ gboolean avctp_unregister_pdu_handler(unsigned int id)
return FALSE;
}

+gboolean avctp_unregister_browsing_pdu_handler()
+{
+ if (browsing_handler)
+ g_free(browsing_handler);
+
+ return TRUE;
+}
+
struct avctp *avctp_connect(const bdaddr_t *src, const bdaddr_t *dst)
{
struct avctp *session;
diff --git a/audio/avctp.h b/audio/avctp.h
index b80e300..fa6eebf 100644
--- a/audio/avctp.h
+++ b/audio/avctp.h
@@ -83,6 +83,10 @@ typedef size_t (*avctp_control_pdu_cb) (struct avctp *session,
typedef gboolean (*avctp_rsp_cb) (struct avctp *session, uint8_t code,
uint8_t subunit, uint8_t *operands,
size_t operand_count, void *user_data);
+typedef void (*avctp_browsing_pdu_cb) (struct avctp *session,
+ uint8_t transaction,
+ uint8_t *operands, size_t operand_count,
+ void *user_data);

unsigned int avctp_add_state_cb(avctp_state_cb cb, void *user_data);
gboolean avctp_remove_state_cb(unsigned int id);
@@ -98,6 +102,10 @@ unsigned int avctp_register_pdu_handler(uint8_t opcode, avctp_control_pdu_cb cb,
void *user_data);
gboolean avctp_unregister_pdu_handler(unsigned int id);

+unsigned int avctp_register_browsing_pdu_handler(avctp_browsing_pdu_cb cb,
+ void *user_data);
+
+gboolean avctp_unregister_browsing_pdu_handler();
int avctp_send_passthrough(struct avctp *session, uint8_t op);
int avctp_send_vendordep(struct avctp *session, uint8_t transaction,
uint8_t code, uint8_t subunit,
--
1.7.5.4

2012-08-06 08:42:30

by Luiz Augusto von Dentz

Subject: Re: [PATCH BlueZ V2 4/5]AVRCP: Register/Unregister Browsing handler

Hi Vani,

On Fri, Aug 3, 2012 at 12:43 PM, Vani-dineshbhai PATEL
<[email protected]> wrote:
> +unsigned int avctp_register_browsing_pdu_handler(avctp_browsing_pdu_cb cb,
> + void *user_data)
> +{
> + static unsigned int id = 0;
> +
> + browsing_handler = g_new(struct avctp_browsing_pdu_handler, 1);
> + browsing_handler->cb = cb;
> + browsing_handler->user_data = user_data;
> + browsing_handler->id = ++id;
> +
> + return browsing_handler->id;
> +}

If we can only have a single pdu handler there is probably no need to
have an id assigned, but I thought the idea was to reuse
avctp_register_pdu_handler with something outside of the range of
control opcodes e.g. > 0xFF.


--
Luiz Augusto von Dentz