Hi Ravi,
On Mon, Nov 10, 2014 at 4:05 PM, Ravi kumar Veeramally
<ravikumar.veeramally@xxxxxxxxxxxxxxx> wrote:
> ---
> android/avrcp.c | 72 +++++++++++++++++++++++++++++++++++++++++++++------------
> android/avrcp.h | 4 ++++
> android/main.c | 11 +++++++++
> 3 files changed, 72 insertions(+), 15 deletions(-)
>
> diff --git a/android/avrcp.c b/android/avrcp.c
> index a0d412d..f372128 100644
> --- a/android/avrcp.c
> +++ b/android/avrcp.c
> @@ -1082,21 +1082,6 @@ bool bt_avrcp_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode)
> }
> record_tg_id = rec->handle;
>
> - rec = avrcp_ct_record();
> - if (!rec) {
> - error("Failed to allocate AVRCP CT record");
> - bt_adapter_remove_record(record_tg_id);
> - goto fail;
> - }
> -
> - if (bt_adapter_add_record(rec, 0) < 0) {
> - error("Failed to register AVRCP CT record");
> - bt_adapter_remove_record(record_tg_id);
> - sdp_record_free(rec);
> - goto fail;
> - }
> - record_ct_id = rec->handle;
We can't really remove the record here otherwise it breaks PTS tests
that requires CT record.
> hal_ipc = ipc;
>
> ipc_register(hal_ipc, HAL_SERVICE_ID_AVRCP, cmd_handlers,
> @@ -1171,3 +1156,60 @@ void bt_avrcp_disconnect(const bdaddr_t *dst)
>
> avrcp_device_remove(dev);
> }
> +
> +static void handle_send_passthrough(const void *buf, uint16_t len)
> +{
> + DBG("Not Implemented");
> +
> + ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_AVRCP_CTRL,
> + HAL_OP_AVRCP_CTRL_SEND_PASSTHROUGH,
> + HAL_STATUS_UNSUPPORTED);
> +}
> +
> +static const struct ipc_handler ctrl_cmd_handlers[] = {
> + /* HAL_OP_AVRCP_CTRL_SEND_PASSTHROUGH */
> + { handle_send_passthrough, false,
> + sizeof(struct hal_cmd_avrcp_ctrl_send_passthrough) },
> +};
> +
> +bool bt_avrcp_ctrl_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode)
> +{
> + sdp_record_t *rec;
> +
> + DBG("");
Here you can just check if record_ct_id is set then proceed without
adding another record, but you have to remember to do the same in
bt_avrcp_register.
> + rec = avrcp_ct_record();
> + if (!rec) {
> + error("Failed to allocate AVRCP CT record");
> + goto fail;
> + }
> +
> + if (bt_adapter_add_record(rec, 0) < 0) {
> + error("Failed to register AVRCP CT record");
> + sdp_record_free(rec);
> + goto fail;
> + }
> +
> + record_ct_id = rec->handle;
> +
> + if (!hal_ipc)
> + hal_ipc = ipc;
> +
> + ipc_register(hal_ipc, HAL_SERVICE_ID_AVRCP_CTRL, ctrl_cmd_handlers,
> + G_N_ELEMENTS(ctrl_cmd_handlers));
> +
> + return true;
> +
> +fail:
> + return false;
> +}
> +
> +void bt_avrcp_ctrl_unregister(void)
> +{
> + DBG("");
> +
> + ipc_unregister(hal_ipc, HAL_SERVICE_ID_AVRCP_CTRL);
Here it is a bit trickier, you might have to check if record_tg_id is
valid then leave it registered but something similar should be done
for bt_avrcp_unregister so it does not end up removing CT record if
ctrl interface is registered.
> + bt_adapter_remove_record(record_ct_id);
> + record_ct_id = 0;
> +}
> diff --git a/android/avrcp.h b/android/avrcp.h
> index 11e79b7..0af9f14 100644
> --- a/android/avrcp.h
> +++ b/android/avrcp.h
> @@ -24,5 +24,9 @@
> bool bt_avrcp_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode);
> void bt_avrcp_unregister(void);
>
> +bool bt_avrcp_ctrl_register(struct ipc *ipc, const bdaddr_t *addr,
> + uint8_t mode);
> +void bt_avrcp_ctrl_unregister(void);
> +
> void bt_avrcp_connect(const bdaddr_t *dst);
> void bt_avrcp_disconnect(const bdaddr_t *dst);
> diff --git a/android/main.c b/android/main.c
> index 58dd9ab..21becf6 100644
> --- a/android/main.c
> +++ b/android/main.c
> @@ -208,6 +208,14 @@ static void service_register(const void *buf, uint16_t len)
> }
>
> break;
> + case HAL_SERVICE_ID_AVRCP_CTRL:
> + if (!bt_avrcp_ctrl_register(hal_ipc, &adapter_bdaddr,
> + m->mode)) {
> + status = HAL_STATUS_FAILED;
> + goto failed;
> + }
> +
> + break;
> case HAL_SERVICE_ID_HANDSFREE:
> if (!bt_handsfree_register(hal_ipc, &adapter_bdaddr, m->mode,
> m->max_clients)) {
> @@ -286,6 +294,9 @@ static bool unregister_service(uint8_t id)
> case HAL_SERVICE_ID_AVRCP:
> bt_avrcp_unregister();
> break;
> + case HAL_SERVICE_ID_AVRCP_CTRL:
> + bt_avrcp_ctrl_unregister();
> + break;
> case HAL_SERVICE_ID_HANDSFREE:
> bt_handsfree_unregister();
> break;
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
