* [PATCH] emulator: add AT+CMEE support for HFP
@ 2011-04-01 14:21 Olivier Guiter
2011-04-05 5:40 ` Denis Kenzior
0 siblings, 1 reply; 2+ messages in thread
From: Olivier Guiter @ 2011-04-01 14:21 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 3235 bytes --]
---
src/emulator.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/src/emulator.c b/src/emulator.c
index c84f0a9..24897b4 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -29,6 +29,7 @@
#include <glib.h>
#include "ofono.h"
+#include "common.h"
#include "gatserver.h"
#include "gatppp.h"
@@ -48,6 +49,7 @@ struct ofono_emulator {
int r_features;
int events_mode;
gboolean events_ind;
+ char cme_error_ind;
GSList *indicators;
};
@@ -387,6 +389,52 @@ fail:
}
}
+static void cmee_cb(GAtServer *server, GAtServerRequestType type,
+ GAtResult *result, gpointer user_data)
+{
+ struct ofono_emulator *em = user_data;
+ GAtResultIter iter;
+ int val;
+ char buf[16];
+
+ switch (type) {
+ case G_AT_SERVER_REQUEST_TYPE_SET:
+ g_at_result_iter_init(&iter, result);
+ g_at_result_iter_next(&iter, "");
+
+ if (g_at_result_iter_next_number(&iter, &val) == FALSE)
+ goto fail;
+
+ if ((val < 0) && (val > 1))
+ goto fail;
+
+ em->cme_error_ind = (char)val;
+
+ sprintf(buf, "+CMEE: %d", em->cme_error_ind);
+ g_at_server_send_info(em->server, buf, TRUE);
+ g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+ break;
+
+ case G_AT_SERVER_REQUEST_TYPE_QUERY:
+ sprintf(buf, "+CMEE: %d", em->cme_error_ind);
+ g_at_server_send_info(em->server, buf, TRUE);
+ g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+ break;
+
+ case G_AT_SERVER_REQUEST_TYPE_SUPPORT:
+ /* HFP only support 0 and 1 */
+ sprintf(buf, "+CMEE: (0,1)");
+ g_at_server_send_info(em->server, buf, TRUE);
+ g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+ break;
+
+ default:
+fail:
+ g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
+ break;
+ }
+}
+
static void emulator_add_indicator(struct ofono_emulator *em, const char* name,
int min, int max, int dflt)
{
@@ -462,6 +510,7 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
g_at_server_register(em->server, "+BRSF", brsf_cb, em, NULL);
g_at_server_register(em->server, "+CIND", cind_cb, em, NULL);
g_at_server_register(em->server, "+CMER", cmer_cb, em, NULL);
+ g_at_server_register(em->server, "+CMEE", cmee_cb, em, NULL);
}
__ofono_atom_register(em->atom, emulator_unregister);
@@ -505,6 +554,7 @@ struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
/* TODO: Check real local features */
em->l_features = 32;
em->events_mode = 3; /* default mode is forwarding events */
+ em->cme_error_ind = 0; /* numeric only */
em->atom = __ofono_modem_add_atom_offline(modem, atom_t,
emulator_remove, em);
@@ -533,7 +583,14 @@ void ofono_emulator_send_final(struct ofono_emulator *em,
break;
case OFONO_ERROR_TYPE_CME:
- sprintf(buf, "+CME ERROR: %d", final->error);
+ /* default string */
+ sprintf(buf, "ERROR");
+
+ if (em->cme_error_ind == 1)
+ sprintf(buf, "+CME ERROR: %d", final->error);
+ else if (em->cme_error_ind == 2)
+ sprintf(buf, "+CME ERROR: %s", telephony_error_to_str(final));
+
g_at_server_send_ext_final(em->server, buf);
break;
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] emulator: add AT+CMEE support for HFP
2011-04-01 14:21 [PATCH] emulator: add AT+CMEE support for HFP Olivier Guiter
@ 2011-04-05 5:40 ` Denis Kenzior
0 siblings, 0 replies; 2+ messages in thread
From: Denis Kenzior @ 2011-04-05 5:40 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 3965 bytes --]
Hi Olivier,
On 04/01/2011 09:21 AM, Olivier Guiter wrote:
> ---
> src/emulator.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 58 insertions(+), 1 deletions(-)
>
> diff --git a/src/emulator.c b/src/emulator.c
> index c84f0a9..24897b4 100644
> --- a/src/emulator.c
> +++ b/src/emulator.c
> @@ -29,6 +29,7 @@
> #include <glib.h>
>
> #include "ofono.h"
> +#include "common.h"
> #include "gatserver.h"
> #include "gatppp.h"
>
> @@ -48,6 +49,7 @@ struct ofono_emulator {
> int r_features;
> int events_mode;
> gboolean events_ind;
> + char cme_error_ind;
You probably want unsigned char here, since the value is never negative.
> GSList *indicators;
> };
>
> @@ -387,6 +389,52 @@ fail:
> }
> }
>
> +static void cmee_cb(GAtServer *server, GAtServerRequestType type,
> + GAtResult *result, gpointer user_data)
> +{
> + struct ofono_emulator *em = user_data;
> + GAtResultIter iter;
> + int val;
> + char buf[16];
> +
> + switch (type) {
> + case G_AT_SERVER_REQUEST_TYPE_SET:
> + g_at_result_iter_init(&iter, result);
> + g_at_result_iter_next(&iter, "");
> +
> + if (g_at_result_iter_next_number(&iter, &val) == FALSE)
> + goto fail;
> +
> + if ((val < 0) && (val > 1))
Please avoid unneeded parentheses whenever possible.
> + goto fail;
> +
> + em->cme_error_ind = (char)val;
Do you really need this cast?
> +
> + sprintf(buf, "+CMEE: %d", em->cme_error_ind);
> + g_at_server_send_info(em->server, buf, TRUE);
> + g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
> + break;
> +
> + case G_AT_SERVER_REQUEST_TYPE_QUERY:
> + sprintf(buf, "+CMEE: %d", em->cme_error_ind);
> + g_at_server_send_info(em->server, buf, TRUE);
> + g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
> + break;
> +
> + case G_AT_SERVER_REQUEST_TYPE_SUPPORT:
> + /* HFP only support 0 and 1 */
> + sprintf(buf, "+CMEE: (0,1)");
> + g_at_server_send_info(em->server, buf, TRUE);
> + g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
> + break;
> +
> + default:
> +fail:
> + g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
> + break;
> + }
> +}
> +
> static void emulator_add_indicator(struct ofono_emulator *em, const char* name,
> int min, int max, int dflt)
> {
> @@ -462,6 +510,7 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
> g_at_server_register(em->server, "+BRSF", brsf_cb, em, NULL);
> g_at_server_register(em->server, "+CIND", cind_cb, em, NULL);
> g_at_server_register(em->server, "+CMER", cmer_cb, em, NULL);
> + g_at_server_register(em->server, "+CMEE", cmee_cb, em, NULL);
> }
>
> __ofono_atom_register(em->atom, emulator_unregister);
> @@ -505,6 +554,7 @@ struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
> /* TODO: Check real local features */
> em->l_features = 32;
> em->events_mode = 3; /* default mode is forwarding events */
> + em->cme_error_ind = 0; /* numeric only */
The comment does not match the initializer? Do you really mean numeric
only here (e.g. CMEE=1) or something like disable cme-error? What
default does BT-HFP spec suggests?
>
> em->atom = __ofono_modem_add_atom_offline(modem, atom_t,
> emulator_remove, em);
> @@ -533,7 +583,14 @@ void ofono_emulator_send_final(struct ofono_emulator *em,
> break;
>
> case OFONO_ERROR_TYPE_CME:
> - sprintf(buf, "+CME ERROR: %d", final->error);
> + /* default string */
> + sprintf(buf, "ERROR");
> +
> + if (em->cme_error_ind == 1)
> + sprintf(buf, "+CME ERROR: %d", final->error);
> + else if (em->cme_error_ind == 2)
> + sprintf(buf, "+CME ERROR: %s", telephony_error_to_str(final));
> +
I suspect that a switch/case would be more readable and slightly more
efficient here.
> g_at_server_send_ext_final(em->server, buf);
> break;
>
Regards,
-Denis
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-05 5:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-01 14:21 [PATCH] emulator: add AT+CMEE support for HFP Olivier Guiter
2011-04-05 5:40 ` Denis Kenzior
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.