2014-01-31 12:36:16

by Andrei Emeltchenko

Subject: [PATCH 1/2] avrcp: Fix printing incorrect order for avrcp control header

From: Andrei Emeltchenko <[email protected]>

---
profiles/audio/avrcp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 5030ce1..bc5cab3 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -1658,7 +1658,7 @@ static size_t handle_vendordep_pdu(struct avctp *conn, uint8_t transaction,
}

DBG("AVRCP PDU 0x%02X, company 0x%06X len 0x%04X",
- pdu->pdu_id, company_id, pdu->params_len);
+ pdu->pdu_id, company_id, ntohs(pdu->params_len));

pdu->packet_type = 0;
pdu->rsvd = 0;
@@ -1755,7 +1755,7 @@ size_t avrcp_handle_vendor_reject(uint8_t *code, uint8_t *operands)
pdu->params[0] = AVRCP_STATUS_INTERNAL_ERROR;

DBG("rejecting AVRCP PDU 0x%02X, company 0x%06X len 0x%04X",
- pdu->pdu_id, company_id, pdu->params_len);
+ pdu->pdu_id, company_id, ntohs(pdu->params_len));

return AVRCP_HEADER_LENGTH + 1;
}
--
1.8.3.2

2014-01-31 12:36:17

by Andrei Emeltchenko

Subject: [PATCH 2/2] avrcp: Fix printing order for browsing avrcp header

From: Andrei Emeltchenko <[email protected]>

---
profiles/audio/avrcp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index bc5cab3..4ece4af 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -1730,7 +1730,7 @@ static size_t handle_browsing_pdu(struct avctp *conn,
struct avrcp_browsing_header *pdu = (void *) operands;

DBG("AVRCP Browsing PDU 0x%02X, len 0x%04X", pdu->pdu_id,
- pdu->param_len);
+ ntohs(pdu->param_len));

for (handler = browsing_handlers; handler->pdu_id; handler++) {
if (handler->pdu_id == pdu->pdu_id)
--
1.8.3.2

2014-02-02 15:50:29

by Luiz Augusto von Dentz

Subject: Re: [PATCH 1/2] avrcp: Fix printing incorrect order for avrcp control header

Hi Andrei,

On Fri, Jan 31, 2014 at 4:36 AM, Andrei Emeltchenko
<[email protected]> wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> ---
> profiles/audio/avrcp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
> index 5030ce1..bc5cab3 100644
> --- a/profiles/audio/avrcp.c
> +++ b/profiles/audio/avrcp.c
> @@ -1658,7 +1658,7 @@ static size_t handle_vendordep_pdu(struct avctp *conn, uint8_t transaction,
> }
>
> DBG("AVRCP PDU 0x%02X, company 0x%06X len 0x%04X",
> - pdu->pdu_id, company_id, pdu->params_len);
> + pdu->pdu_id, company_id, ntohs(pdu->params_len));
>
> pdu->packet_type = 0;
> pdu->rsvd = 0;
> @@ -1755,7 +1755,7 @@ size_t avrcp_handle_vendor_reject(uint8_t *code, uint8_t *operands)
> pdu->params[0] = AVRCP_STATUS_INTERNAL_ERROR;
>
> DBG("rejecting AVRCP PDU 0x%02X, company 0x%06X len 0x%04X",
> - pdu->pdu_id, company_id, pdu->params_len);
> + pdu->pdu_id, company_id, ntohs(pdu->params_len));
>
> return AVRCP_HEADER_LENGTH + 1;
> }
> --
> 1.8.3.2

Pushed, thanks.


--
Luiz Augusto von Dentz