diff options
author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-10-02 16:25:36 +0300 |
---|---|---|
committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-10-06 16:01:51 +0300 |
commit | fa4a6355328c54d757b52aed3d48d5d426f915bb (patch) | |
tree | ba969fe8fc44c6b69eb170687a3eb3fd3465a962 /android/avrcp-lib.c | |
parent | 7fd13dbe6303a567d0f1e8595094a3cfd459d0ff (diff) | |
download | bluez-fa4a6355328c54d757b52aed3d48d5d426f915bb.tar.gz |
android/avrcp-lib: Add ChangePath structs
Diffstat (limited to 'android/avrcp-lib.c')
-rw-r--r-- | android/avrcp-lib.c | 53 |
1 files changed, 34 insertions, 19 deletions
diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c index 5521f515d..0024016f6 100644 --- a/android/avrcp-lib.c +++ b/android/avrcp-lib.c @@ -233,6 +233,17 @@ struct get_folder_items_rsp { uint8_t data[0]; } __attribute__ ((packed)); +struct change_path_req { + uint16_t counter; + uint8_t direction; + uint64_t uid; +} __attribute__ ((packed)); + +struct change_path_rsp { + uint8_t status; + uint32_t items; +} __attribute__ ((packed)); + struct avrcp_control_handler { uint8_t id; uint8_t code; @@ -1233,7 +1244,7 @@ static ssize_t change_path(struct avrcp *session, uint8_t transaction, void *user_data) { struct avrcp_player *player = user_data; - uint8_t direction; + struct change_path_req *req; uint16_t counter; uint64_t uid; @@ -1242,15 +1253,16 @@ static ssize_t change_path(struct avrcp *session, uint8_t transaction, if (!player->ind || !player->ind->change_path) return -ENOSYS; - if (!params || params_len < 11) + if (!params || params_len < sizeof(*req)) return -EINVAL; - counter = get_be16(¶ms[0]); - direction = params[2]; - uid = get_be64(¶ms[3]); + req = (void *) params; + + counter = get_be16(&req->counter); + uid = get_be64(&req->uid); return player->ind->change_path(session, transaction, counter, - direction, uid, player->user_data); + req->direction, uid, player->user_data); } static ssize_t get_item_attributes(struct avrcp *session, uint8_t transaction, @@ -2643,6 +2655,7 @@ static gboolean change_path_rsp(struct avctp *conn, uint8_t *operands, struct avrcp *session = user_data; struct avrcp_player *player = session->player; struct avrcp_browsing_header *pdu; + struct change_path_rsp *rsp; uint32_t items = 0; int err; @@ -2661,12 +2674,14 @@ static gboolean change_path_rsp(struct avctp *conn, uint8_t *operands, if (err < 0) goto done; - if (pdu->params_len < 5) { + if (pdu->params_len < sizeof(*rsp)) { err = -EPROTO; goto done; } - items = get_be32(&pdu->params[1]); + rsp = (void *) pdu->params; + + items = get_be32(&rsp->items); done: player->cfm->change_path(session, err, items, player->user_data); @@ -2678,14 +2693,14 @@ int avrcp_change_path(struct avrcp *session, uint8_t direction, uint64_t uid, uint16_t counter) { struct iovec iov; - uint8_t pdu[11]; + struct change_path_req req; - put_be16(counter, &pdu[0]); - pdu[2] = direction; - put_be64(uid, &pdu[3]); + put_be16(counter, &req.counter); + req.direction = direction; + put_be64(uid, &req.uid); - iov.iov_base = pdu; - iov.iov_len = sizeof(pdu); + iov.iov_base = &req; + iov.iov_len = sizeof(req); return avrcp_send_browsing_req(session, AVRCP_CHANGE_PATH, &iov, 1, change_path_rsp, session); @@ -3254,13 +3269,13 @@ int avrcp_change_path_rsp(struct avrcp *session, uint8_t transaction, uint32_t items) { struct iovec iov; - uint8_t pdu[5]; + struct change_path_rsp rsp; - pdu[0] = AVRCP_STATUS_SUCCESS; - put_be32(items, &pdu[1]); + rsp.status = AVRCP_STATUS_SUCCESS; + put_be32(items, &rsp.items); - iov.iov_base = pdu; - iov.iov_len = sizeof(pdu); + iov.iov_base = &rsp; + iov.iov_len = sizeof(rsp); return avrcp_send_browsing(session, transaction, AVRCP_CHANGE_PATH, &iov, 1); |