Re: [PATCH] emulator: add AT hook_control_cb() CB and register it

[Denis Kenzior <denkenz@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2257 bytes --]

Hi Guillaume,

On 03/24/2011 05:25 AM, Guillaume Zajac wrote:
> ---
>  src/emulator.c |   44 +++++++++++++++++++++++++++++++++++++++++---
>  1 files changed, 41 insertions(+), 3 deletions(-)
> 
> diff --git a/src/emulator.c b/src/emulator.c
> index c84f0a9..586c7ec 100644
> --- a/src/emulator.c
> +++ b/src/emulator.c
> @@ -177,6 +177,41 @@ error:
>  	g_at_server_send_final(em->server, G_AT_SERVER_RESULT_ERROR);
>  }
>  
> +static void hook_control_cb(GAtServer *server, GAtServerRequestType type,

Can you rename this dun_ath_cb, since this is pretty much dun specific

> +			GAtResult *result, gpointer user_data)
> +{
> +	struct ofono_emulator *em = user_data;
> +	GAtResultIter iter;
> +	int val;
> +
> +	DBG("");
> +
> +	if (type != G_AT_SERVER_REQUEST_TYPE_SET)
> +		goto error;

Wouldn't we be also getting G_AT_SERVER_REQUEST_TYPE_COMMAND_ONLY here?

> +
> +	if (em->ppp == NULL)
> +		goto error;
> +
> +	g_at_result_iter_init(&iter, result);
> +	g_at_result_iter_next(&iter, "");
> +
> +	if (g_at_result_iter_next_number(&iter, &val) == FALSE)
> +		goto error;
> +
> +	if (val != 0)
> +		goto error;
> +
> +	g_at_ppp_unref(em->ppp);
> +	em->ppp = NULL;
> +
> +	g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
> +
> +	return;
> +
> +error:
> +	g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
> +}
> +
>  static void brsf_cb(GAtServer *server, GAtServerRequestType type,
>  			GAtResult *result, gpointer user_data)
>  {
> @@ -466,10 +501,13 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
>  
>  	__ofono_atom_register(em->atom, emulator_unregister);
>  
> -	if (em->type == OFONO_EMULATOR_TYPE_DUN)
> +	if (em->type == OFONO_EMULATOR_TYPE_DUN) {
>  		g_at_server_register(em->server, "D", dial_cb, em, NULL);
> -	else if (em->type == OFONO_EMULATOR_TYPE_HFP)
> -		g_at_server_set_echo(em->server, FALSE);
> +		g_at_server_register(em->server, "H", hook_control_cb, em, NULL);
> +	} else {
> +		if (em->type == OFONO_EMULATOR_TYPE_HFP)
> +			g_at_server_set_echo(em->server, FALSE);

I'd really prefer this to use a switch/case statement.

> +	}
>  }
>  
>  static void emulator_remove(struct ofono_atom *atom)

Regards,
-Denis