summaryrefslogtreecommitdiff
path: root/android/handsfree-client.c
diff options
context:
space:
mode:
authorLukasz Rymanowski <lukasz.rymanowski@tieto.com>2014-11-19 10:43:35 +0100
committerSzymon Janc <szymon.janc@tieto.com>2014-11-19 15:07:32 +0100
commitce41e74b69cc01c9510edc10acafecbbdb715871 (patch)
treebeb3d5b8db74c28f8ffc2f65af1050b9f4b4f137 /android/handsfree-client.c
parent8b27361d95574ab5b5df396606135824fce1d4b2 (diff)
downloadbluez-ce41e74b69cc01c9510edc10acafecbbdb715871.tar.gz
android/handsfree-client: Add handle start/stop vr
This patch implements start/stop voice recogniction command handling. It also introduce find_default_device which returns connected device. Note that for now we support only one device as this is HAL limitation
Diffstat (limited to 'android/handsfree-client.c')
-rw-r--r--android/handsfree-client.c106
1 files changed, 102 insertions, 4 deletions
diff --git a/android/handsfree-client.c b/android/handsfree-client.c
index c576ae8dd..8b016c694 100644
--- a/android/handsfree-client.c
+++ b/android/handsfree-client.c
@@ -135,6 +135,11 @@ static uint32_t hfp_hf_record_id = 0;
static struct queue *devices = NULL;
static GIOChannel *hfp_hf_server = NULL;
+static struct device *find_default_device(void)
+{
+ return queue_peek_head(devices);
+}
+
static bool match_by_bdaddr(const void *data, const void *user_data)
{
const bdaddr_t *addr1 = data;
@@ -293,18 +298,95 @@ static void handle_disconnect_audio(const void *buf, uint16_t len)
HAL_STATUS_UNSUPPORTED);
}
+static void cmd_complete_cb(enum hfp_result result, enum hfp_error cme_err,
+ void *user_data)
+{
+ struct hal_ev_hf_client_command_complete ev;
+
+ DBG("");
+
+ memset(&ev, 0, sizeof(ev));
+
+ switch (result) {
+ case HFP_RESULT_OK:
+ ev.type = HAL_HF_CLIENT_CMD_COMP_OK;
+ break;
+ case HFP_RESULT_NO_CARRIER:
+ ev.type = HAL_HF_CLIENT_CMD_COMP_ERR_NO_CARRIER;
+ break;
+ case HFP_RESULT_ERROR:
+ ev.type = HAL_HF_CLIENT_CMD_COMP_ERR;
+ break;
+ case HFP_RESULT_BUSY:
+ ev.type = HAL_HF_CLIENT_CMD_COMP_ERR_BUSY;
+ break;
+ case HFP_RESULT_NO_ANSWER:
+ ev.type = HAL_HF_CLIENT_CMD_COMP_ERR_NO_ANSWER;
+ break;
+ case HFP_RESULT_DELAYED:
+ ev.type = HAL_HF_CLIENT_CMD_COMP_ERR_DELAYED;
+ break;
+ case HFP_RESULT_BLACKLISTED:
+ ev.type = HAL_HF_CLIENT_CMD_COMP_ERR_BACKLISTED;
+ break;
+ case HFP_RESULT_CME_ERROR:
+ ev.type = HAL_HF_CLIENT_CMD_COMP_ERR_CME;
+ ev.cme = cme_err;
+ break;
+ default:
+ error("hf-client: Unknown error code %d", result);
+ ev.type = HAL_HF_CLIENT_CMD_COMP_ERR;
+ break;
+ }
+
+ ipc_send_notif(hal_ipc, HAL_SERVICE_ID_HANDSFREE_CLIENT,
+ HAL_EV_CLIENT_COMMAND_COMPLETE, sizeof(ev), &ev);
+}
+
static void handle_start_vr(const void *buf, uint16_t len)
{
- DBG("Not Implemented");
+ struct device *dev;
+ uint8_t status;
+
+ DBG("");
+
+ dev = find_default_device();
+ if (!dev) {
+ status = HAL_STATUS_FAILED;
+ goto done;
+ }
+
+ if (hfp_hf_send_command(dev->hf, cmd_complete_cb, NULL, "AT+BVRA=1"))
+ status = HAL_STATUS_SUCCESS;
+ else
+ status = HAL_STATUS_FAILED;
+
+done:
ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE_CLIENT,
- HAL_OP_HF_CLIENT_START_VR, HAL_STATUS_UNSUPPORTED);
+ HAL_OP_HF_CLIENT_START_VR, status);
}
static void handle_stop_vr(const void *buf, uint16_t len)
{
- DBG("Not Implemented");
+ struct device *dev;
+ uint8_t status;
+
+ DBG("");
+
+ dev = find_default_device();
+ if (!dev) {
+ status = HAL_STATUS_FAILED;
+ goto done;
+ }
+
+ if (hfp_hf_send_command(dev->hf, cmd_complete_cb, NULL, "AT+BVRA=0"))
+ status = HAL_STATUS_SUCCESS;
+ else
+ status = HAL_STATUS_FAILED;
+
+done:
ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE_CLIENT,
- HAL_OP_HF_CLIENT_STOP_VR, HAL_STATUS_UNSUPPORTED);
+ HAL_OP_HF_CLIENT_STOP_VR, status);
}
static void handle_volume_control(const void *buf, uint16_t len)
@@ -447,6 +529,20 @@ static void get_local_codecs_string(struct device *dev, char *buf,
}
}
+static void bvra_cb(struct hfp_context *context, void *user_data)
+{
+ struct hal_ev_hf_client_vr_state ev;
+ unsigned int val;
+
+ if (!hfp_context_get_number(context, &val) || val > 1)
+ return;
+
+ ev.state = val ? HAL_HF_CLIENT_VR_STARTED : HAL_HF_CLIENT_VR_STOPPED;
+
+ ipc_send_notif(hal_ipc, HAL_SERVICE_ID_HANDSFREE_CLIENT,
+ HAL_EV_HF_CLIENT_VR_STATE, sizeof(ev), &ev);
+}
+
static void slc_completed(struct device *dev)
{
DBG("");
@@ -457,6 +553,8 @@ static void slc_completed(struct device *dev)
* TODO: Notify Android with indicators, register unsolicited result
* handlers
*/
+
+ hfp_hf_register(dev->hf, bvra_cb, "+BRVA", dev, NULL);
}
static void slc_chld_cb(struct hfp_context *context, void *user_data)