Couple minor fixes and clean patches to HFP client implementation
Lukasz Rymanowski (3):
android/handsfree-client: Fix for correct audio state
android/handsfree-client: Decrease number of memcpy
android/handsfree-client: Trivial fix typo
android/hal-msg.h | 2 +-
android/handsfree-client.c | 31 ++++++++++++++++---------------
2 files changed, 17 insertions(+), 16 deletions(-)
--
1.8.4
Hi,
On 2 December 2014 at 12:03, Lukasz Rymanowski
<[email protected]> wrote:
> Disconnect audio state shall be set just after bt_sco_disconnect has
> been called.
> ---
> android/handsfree-client.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/android/handsfree-client.c b/android/handsfree-client.c
> index 9818a47..b84ad79 100644
> --- a/android/handsfree-client.c
> +++ b/android/handsfree-client.c
> @@ -387,6 +387,8 @@ static void handle_disconnect_audio(const void *buf, uint16_t len)
> }
>
> bt_sco_disconnect(sco);
> + set_audio_state(dev, HAL_HF_CLIENT_AUDIO_STATE_DISCONNECTED);
> +
Ignore that patch. Correct fix shall be in sco.c Will send in separate patch.
\Lukasz
> status = HAL_STATUS_SUCCESS;
>
> done:
> --
> 1.8.4
>
Some string we can directly copy from context to IPC event struct.
---
android/handsfree-client.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/android/handsfree-client.c b/android/handsfree-client.c
index b84ad79..5f7f68a 100644
--- a/android/handsfree-client.c
+++ b/android/handsfree-client.c
@@ -85,6 +85,9 @@
#define CODEC_ID_CVSD 0x01
#define CODEC_ID_MSBC 0x02
+#define MAX_NUMBER_LEN 33
+#define MAX_OPERATOR_NAME_LEN 17
+
enum hfp_indicator {
HFP_INDICATOR_SERVICE = 0,
HFP_INDICATOR_CALL,
@@ -940,7 +943,6 @@ static void clcc_cb(struct hfp_context *context, void *user_data)
uint8_t buf[IPC_MTU];
struct hal_ev_hf_client_current_call *ev = (void *) buf;
unsigned int val;
- char number[33];
DBG("");
@@ -982,10 +984,9 @@ static void clcc_cb(struct hfp_context *context, void *user_data)
ev->multiparty = val;
- if (hfp_context_get_string(context, number, sizeof(number))) {
- ev->number_len = strlen(number) + 1;
- memcpy(ev->number, number, ev->number_len);
- }
+ if (hfp_context_get_string(context, (char *) &ev->number[0],
+ MAX_NUMBER_LEN))
+ ev->number_len = strlen((char *) ev->number) + 1;
ipc_send_notif(hal_ipc, HAL_SERVICE_ID_HANDSFREE_CLIENT,
HAL_EV_HF_CLIENT_CURRENT_CALL,
@@ -1022,7 +1023,6 @@ static void cnum_cb(struct hfp_context *context, void *user_data)
{
uint8_t buf[IPC_MTU];
struct hal_ev_hf_client_subscriber_service_info *ev = (void *) buf;
- char number[33];
unsigned int service;
DBG("");
@@ -1030,11 +1030,14 @@ static void cnum_cb(struct hfp_context *context, void *user_data)
/* Alpha field is empty string, just skip it */
hfp_context_skip_field(context);
- if (!hfp_context_get_string(context, number, sizeof(number))) {
+ if (!hfp_context_get_string(context, (char *) &ev->name[0],
+ MAX_NUMBER_LEN)) {
error("hf-client: Could not get number");
return;
}
+ ev->name_len = strlen((char *) &ev->name[0]) + 1;
+
/* Type is not used in Android */
hfp_context_skip_field(context);
@@ -1044,9 +1047,6 @@ static void cnum_cb(struct hfp_context *context, void *user_data)
if (!hfp_context_get_number(context, &service))
return;
- ev->name_len = strlen(number) + 1;
- memcpy(ev->name, number, ev->name_len);
-
switch (service) {
case 4:
ev->type = HAL_HF_CLIENT_SUBSCR_TYPE_VOICE;
@@ -1068,7 +1068,6 @@ static void cops_cb(struct hfp_context *context, void *user_data)
{
uint8_t buf[IPC_MTU];
struct hal_ev_hf_client_operator_name *ev = (void *) buf;
- char name[17];
unsigned int format;
DBG("");
@@ -1082,13 +1081,13 @@ static void cops_cb(struct hfp_context *context, void *user_data)
if (format != 0)
info("hf-client: Not correct string format in +COSP");
- if (!hfp_context_get_string(context, name, sizeof(name))) {
+ if (!hfp_context_get_string(context,(char *) &ev->name[0] ,
+ MAX_OPERATOR_NAME_LEN)) {
error("hf-client: incorrect COPS response");
return;
}
- ev->name_len = strlen(name) + 1;
- memcpy(ev->name, name, ev->name_len);
+ ev->name_len = strlen((char *) &ev->name[0]) + 1;
ipc_send_notif(hal_ipc, HAL_SERVICE_ID_HANDSFREE_CLIENT,
HAL_EV_HF_CLIENT_OPERATOR_NAME,
--
1.8.4
---
android/hal-msg.h | 2 +-
android/handsfree-client.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 33b53c5..e0be314 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -2223,7 +2223,7 @@ struct hal_ev_hf_client_call_waiting {
} __attribute__((packed));
#define HAL_HF_CLIENT_DIRECTION_OUTGOING 0x00
-#define HAL_HF_CLIENT_DIRECTION_INCOMIGN 0x01
+#define HAL_HF_CLIENT_DIRECTION_INCOMING 0x01
#define HAL_HF_CLIENT_CALL_STATE_ACTIVE 0x00
#define HAL_HF_CLIENT_CALL_STATE_HELD 0x01
diff --git a/android/handsfree-client.c b/android/handsfree-client.c
index 5f7f68a..1caeaed 100644
--- a/android/handsfree-client.c
+++ b/android/handsfree-client.c
@@ -956,7 +956,7 @@ static void clcc_cb(struct hfp_context *context, void *user_data)
ev->index = val;
if (!hfp_context_get_number(context, &val) ||
- val > HAL_HF_CLIENT_DIRECTION_INCOMIGN) {
+ val > HAL_HF_CLIENT_DIRECTION_INCOMING) {
error("hf-client: Could not get direction");
return;
}
--
1.8.4
Disconnect audio state shall be set just after bt_sco_disconnect has
been called.
---
android/handsfree-client.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/android/handsfree-client.c b/android/handsfree-client.c
index 9818a47..b84ad79 100644
--- a/android/handsfree-client.c
+++ b/android/handsfree-client.c
@@ -387,6 +387,8 @@ static void handle_disconnect_audio(const void *buf, uint16_t len)
}
bt_sco_disconnect(sco);
+ set_audio_state(dev, HAL_HF_CLIENT_AUDIO_STATE_DISCONNECTED);
+
status = HAL_STATUS_SUCCESS;
done:
--
1.8.4