Hi Marcin,
On 30 October 2014 10:43, Marcin Kraglak <marcin.kraglak@xxxxxxxxx> wrote:
> Hi Lukasz,
>
> On 10 October 2014 01:50, Lukasz Rymanowski <lukasz.rymanowski@xxxxxxxxx> wrote:
>> ---
>> src/shared/hfp.c | 22 +++++++++++++++++++---
>> src/shared/hfp.h | 2 ++
>> unit/test-hfp.c | 2 ++
>> 3 files changed, 23 insertions(+), 3 deletions(-)
>>
>> diff --git a/src/shared/hfp.c b/src/shared/hfp.c
>> index 87e4017..6f2d28a 100644
>> --- a/src/shared/hfp.c
>> +++ b/src/shared/hfp.c
>> @@ -903,7 +903,9 @@ static void hf_skip_whitespace(struct hfp_context *context)
>> context->offset++;
>> }
>>
>> -static bool is_response(const char *prefix, enum hfp_result *result)
>> +static bool is_response(const char *prefix, enum hfp_result *result,
>> + enum hfp_error *cme_err,
>> + struct hfp_context *context)
>> {
>> if (strcmp(prefix, "OK") == 0) {
>> *result = HFP_RESULT_OK;
>> @@ -940,6 +942,19 @@ static bool is_response(const char *prefix, enum hfp_result *result)
>> return true;
>> }
>>
>> + if (strcmp(prefix, "+CME ERROR") == 0) {
>> + uint32_t val;
>> +
>> + *result = HFP_RESULT_CME_ERROR;
>> +
>> + if (hfp_context_get_number(context, &val))
>> + *cme_err = val;
>
> maybe check if val <= HFP_ERROR_NETWORK_NOT_ALLOWED? otherwise we can pass
> value bigger that enum.
Will do so.
>And maybe we could call resp_cb with context
> intead of cme_err which is valid just in case of
> CME ERROR response? What you think?
Just don't want to bother user with parsing context. Err and cme_err
should be fine.
>> + else
>> + *cme_err = HFP_ERROR_AG_FAILURE;
>> +
>> + return true;
>> + }
>> +
>> return false;
>> }
>>
>> @@ -972,6 +987,7 @@ static void hf_call_prefix_handler(struct hfp_hf *hfp, const char *data)
>> const char *separators = ";:\0";
>> struct hfp_context context;
>> enum hfp_result result;
>> + enum hfp_error cme_err = 0;
>
> shouldn't we set set cme_err = HFP_RESULT_OK?
This is not meant to be HFP_RESULT_OK but 0. We usually set not used
values to 0. Maybe I put comment there.
>
>> char lookup_prefix[18];
>> uint8_t pref_len = 0;
>> const char *prefix;
>> @@ -997,14 +1013,14 @@ static void hf_call_prefix_handler(struct hfp_hf *hfp, const char *data)
>> lookup_prefix[pref_len] = '\0';
>> context.offset += pref_len + 1;
>>
>> - if (is_response(lookup_prefix, &result)) {
>> + if (is_response(lookup_prefix, &result, &cme_err, &context)) {
>> struct cmd_response *cmd;
>>
>> cmd = queue_peek_head(hfp->cmd_queue);
>> if (!cmd)
>> return;
>>
>> - cmd->resp_cb(cmd->prefix, result, cmd->user_data);
>> + cmd->resp_cb(cmd->prefix, result, cme_err, cmd->user_data);
>>
>> queue_remove(hfp->cmd_queue, cmd);
>> destroy_cmd_response(cmd);
>> diff --git a/src/shared/hfp.h b/src/shared/hfp.h
>> index 27c26a2..e4a70e0 100644
>> --- a/src/shared/hfp.h
>> +++ b/src/shared/hfp.h
>> @@ -34,6 +34,7 @@ enum hfp_result {
>> HFP_RESULT_NO_ANSWER = 8,
>> HFP_RESULT_DELAYED = 9,
>> HFP_RESULT_BLACKLISTED = 10,
>> + HFP_RESULT_CME_ERROR = 11,
>> };
>>
>> enum hfp_error {
>> @@ -86,6 +87,7 @@ typedef void (*hfp_disconnect_func_t)(void *user_data);
>>
>> typedef void (*hfp_response_func_t)(const char *prefix,
>> enum hfp_result result,
>> + enum hfp_error cme_err,
>> void *user_data);
>>
>> struct hfp_gw;
>> diff --git a/unit/test-hfp.c b/unit/test-hfp.c
>> index c597fd0..bc05086 100644
>> --- a/unit/test-hfp.c
>> +++ b/unit/test-hfp.c
>> @@ -476,6 +476,7 @@ static void hf_unsolicited_resp_cb(struct hfp_context *context,
>> }
>>
>> static void hf_response_with_data(const char *prefix, enum hfp_result res,
>> + enum hfp_error cme_err,
>> void *user_data)
>> {
>> struct context *context = user_data;
>> @@ -487,6 +488,7 @@ static void hf_response_with_data(const char *prefix, enum hfp_result res,
>> }
>>
>> static void hf_brsf_response_cb(const char *prefix, enum hfp_result res,
>> + enum hfp_error cme_err,
>> void *user_data)
>> {
>> struct context *context = user_data;
>> --
>> 1.8.4
>>
>> --
>> 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
>
> BR
> Marcin
BR
Lukasz
--
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
