korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-29 22:03:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

android/avrcp-lib: Embed response code into handler table

Browse Source 
This makes the handlers code simpler as they don't need to care about
the response or reject opcode.
This commit is contained in:
Luiz Augusto von Dentz 2014-02-28 14:00:08 +02:00
parent 024b631ad0
commit 9350da3d4d
3 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
android/avrcp-lib.c
View File

@ -170,14 +170,22 @@ static ssize_t handle_vendordep_pdu(struct avctp *conn, uint8_t transaction,
goto reject;
}
ret = handler->func(session, transaction, code, params_len,
pdu->params, session->control_data);
ret = handler->func(session, transaction, params_len, pdu->params,
session->control_data);
if (ret < 0) {
if (ret == -EAGAIN)
switch (ret) {
case -EAGAIN:
return ret;
goto reject;
case -EINVAL:
pdu->params[0] = AVRCP_STATUS_INVALID_PARAM;
goto reject;
default:
pdu->params[0] = AVRCP_STATUS_INTERNAL_ERROR;
goto reject;
}
}
*code = handler->rsp;
pdu->params_len = htons(ret);
return AVRCP_HEADER_LENGTH + ret;

4
android/avrcp-lib.h
View File

@ -79,9 +79,9 @@ struct avrcp;
struct avrcp_control_handler {
uint8_t id;
uint8_t code;
uint8_t rsp;
ssize_t (*func) (struct avrcp *session, uint8_t transaction,
uint8_t *code, uint16_t params_len, uint8_t *params,
void *user_data);
uint16_t params_len, uint8_t *params, void *user_data);
};
struct avrcp_passthrough_handler {

41
unit/test-avrcp.c
View File

@ -31,6 +31,7 @@
#include <inttypes.h>
#include <string.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/socket.h>
#include <glib.h>
@ -293,61 +294,61 @@ static const struct avrcp_passthrough_handler passthrough_handlers[] = {
};
static ssize_t avrcp_handle_get_capabilities(struct avrcp *session,
uint8_t transaction, uint8_t *code,
uint16_t params_len, uint8_t *params,
void *user_data)
uint8_t transaction,
uint16_t params_len,
uint8_t *params,
void *user_data)
{
uint32_t id = 0x001958;
if (params_len != 1)
goto fail;
return -EINVAL;
switch (params[0]) {
case CAP_COMPANY_ID:
params[1] = 1;
hton24(&params[2], id);
*code = AVC_CTYPE_STABLE;
return 5;
}
fail:
params[0] = AVRCP_STATUS_INVALID_PARAM;
*code = AVC_CTYPE_REJECTED;
return 1;
return -EINVAL;
}
static ssize_t avrcp_handle_list_attributes(struct avrcp *session,
uint8_t transaction, uint8_t *code,
uint16_t params_len, uint8_t *params,
void *user_data)
uint8_t transaction,
uint16_t params_len,
uint8_t *params,
void *user_data)
{
DBG("");
params[0] = 0;
*code = AVC_CTYPE_STABLE;
return 1;
}
static ssize_t avrcp_handle_get_player_attr_text(struct avrcp *session,
uint8_t transaction, uint8_t *code,
uint16_t params_len, uint8_t *params,
void *user_data)
uint8_t transaction,
uint16_t params_len,
uint8_t *params,
void *user_data)
{
DBG("");
params[0] = 0;
*code = AVC_CTYPE_STABLE;
return 1;
}
static const struct avrcp_control_handler control_handlers[] = {
{ AVRCP_GET_CAPABILITIES, AVC_CTYPE_STATUS,
{ AVRCP_GET_CAPABILITIES,
AVC_CTYPE_STATUS, AVC_CTYPE_STABLE,
avrcp_handle_get_capabilities },
{ AVRCP_LIST_PLAYER_ATTRIBUTES, AVC_CTYPE_STATUS,
{ AVRCP_LIST_PLAYER_ATTRIBUTES,
AVC_CTYPE_STATUS, AVC_CTYPE_STABLE,
avrcp_handle_list_attributes },
{ AVRCP_GET_PLAYER_ATTRIBUTE_TEXT, AVC_CTYPE_STATUS,
{ AVRCP_GET_PLAYER_ATTRIBUTE_TEXT,
AVC_CTYPE_STATUS, AVC_CTYPE_STABLE,
avrcp_handle_get_player_attr_text },
{ },
};