2011-08-24 13:05:09

by David Stockwell

Subject: [PATCH 1/3] AVRCP: get/set three-byte company-id

AVRCP: get/set three-byte company-id

---
audio/control.c | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/audio/control.c b/audio/control.c
index 882c9fb..be95c19 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -470,6 +470,29 @@ static sdp_record_t *avrcp_tg_record(void)
return record;
}

+/**
+ * get_company_id:
+ *
+ * Get three-byte Company_ID from incoming AVRCP message
+ */
+static uint32_t get_company_id(const uint8_t cid[3])
+{
+ return cid[0] << 16 | cid[1] << 8 | cid[2];
+}
+
+/**
+ * set_company_id:
+ *
+ * Set three-byte Company_ID into outgoing AVRCP message
+ */
+static void set_company_id(uint8_t cid[3], const uint32_t cid_in)
+{
+ cid[0] = cid_in >> 16;
+ cid[1] = cid_in >> 8;
+ cid[2] = cid_in;
+ return;
+}
+
static int send_event(int fd, uint16_t type, uint16_t code, int32_t value)
{
struct uinput_event event;
@@ -747,9 +770,7 @@ static int avctp_send_event(struct control *control,
uint8_t id, void *data)
avrcp->subunit_type = SUBUNIT_PANEL;
avrcp->opcode = OP_VENDORDEP;

- pdu->company_id[0] = IEEEID_BTSIG >> 16;
- pdu->company_id[1] = (IEEEID_BTSIG >> 8) & 0xFF;
- pdu->company_id[2] = IEEEID_BTSIG & 0xFF;
+ set_company_id(pdu->company_id, IEEEID_BTSIG);

pdu->pdu_id = AVRCP_REGISTER_NOTIFICATION;
pdu->params[0] = id;
@@ -998,9 +1019,7 @@ static int avrcp_handle_get_capabilities(struct control
*control,
switch (pdu->params[0]) {
case CAP_COMPANY_ID:
for (i = 0; i < G_N_ELEMENTS(company_ids); i++) {
- pdu->params[2 + i * 3] = company_ids[i] >> 16;
- pdu->params[3 + i * 3] = (company_ids[i] >> 8) & 0xFF;
- pdu->params[4 + i * 3] = company_ids[i] & 0xFF;
+ set_company_id(&pdu->params[2 + i * 3], company_ids[i]);
}

pdu->params_len = htons(2 + (3 * G_N_ELEMENTS(company_ids)));
@@ -1381,9 +1400,7 @@ static int handle_vendordep_pdu(struct control *control,
int operand_count)
{
struct avrcp_spec_avc_pdu *pdu = (void *) avrcp + AVRCP_HEADER_LENGTH;
- uint32_t company_id = (pdu->company_id[0] << 16) |
- (pdu->company_id[1] << 8) |
- (pdu->company_id[2]);
+ uint32_t company_id = get_company_id(pdu->company_id);
int len;

if (company_id != IEEEID_BTSIG ||
--
1.7.3.4

2011-08-24 12:41:57

by David Stockwell

Subject: Re: [PATCH 1/3] AVRCP: get/set three-byte company-id

Hi Johan,

-----Original Message-----
From: Johan Hedberg
Sent: Wednesday, August 24, 2011 3:32 AM
To: David Stockwell
Cc: [email protected]
Subject: Re: [PATCH 1/3] AVRCP: get/set three-byte company-id

Hi,

On Tue, Aug 23, 2011, David Stockwell wrote:
> AVRCP: get/set three-byte company-id
>
> ---
> audio/control.c | 35 ++++++++++++++++++++++++++---------
> 1 files changed, 26 insertions(+), 9 deletions(-)

This one doesn't seem to apply:

Applying: AVRCP: get/set three-byte company-id
fatal: corrupt patch at line 40
Patch failed at 0001 AVRCP: get/set three-byte company-id

+++++ Hmmm, maybe I need to re-pull and rebase.

Johan

2011-08-24 08:32:37

by Johan Hedberg

Subject: Re: [PATCH 1/3] AVRCP: get/set three-byte company-id

Hi,

On Tue, Aug 23, 2011, David Stockwell wrote:
> AVRCP: get/set three-byte company-id
>
> ---
> audio/control.c | 35 ++++++++++++++++++++++++++---------
> 1 files changed, 26 insertions(+), 9 deletions(-)

This one doesn't seem to apply:

Applying: AVRCP: get/set three-byte company-id
fatal: corrupt patch at line 40
Patch failed at 0001 AVRCP: get/set three-byte company-id

Johan