2:46 a.m.
following commands are supported :
AT+CMER=3,0,0,1,0
OK
AT+CMER=3,0,0,1
OK
AT+CMER=3,,,1
OK
AT+CMER=3,,,1,
OK
AT+CMER=,,0,1,
OK
AT+CMER=3, ,,1
OK
AT+CMER=3,a,0,1
ERROR
AT+CMER=3,"a",0,1
ERROR
AT+CMER=3,
OK
AT+CMER=3
OK
Frédéric Danis (2):
gatchat: add g_at_result_iter_next_number_or_void API
emulator: add support of void parameters in CMER
gatchat/gatresult.c | 25 +++++++++++++++++++++++++
gatchat/gatresult.h | 2 ++
src/emulator.c | 24 ++++++++++++------------
3 files changed, 39 insertions(+), 12 deletions(-)
2:46 a.m.
New subject: [PATCH 1/2] gatchat: add g_at_result_iter_next_number_or_void API
---
gatchat/gatresult.c | 25 +++++++++++++++++++++++++
gatchat/gatresult.h | 2 ++
2 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/gatchat/gatresult.c b/gatchat/gatresult.c
index 8a6dfae..0003f0b 100644
--- a/gatchat/gatresult.c
+++ b/gatchat/gatresult.c
@@ -292,6 +292,31 @@ gboolean g_at_result_iter_next_number(GAtResultIter *iter, gint
*number)
return TRUE;
}
+gboolean g_at_result_iter_next_number_or_void(GAtResultIter *iter, gint *number)
+{
+ unsigned int pos;
+ int len;
+ char *line;
+
+ if (iter == NULL)
+ return FALSE;
+
+ if (iter->l == NULL)
+ return FALSE;
+
+ line = iter->l->data;
+ len = strlen(line);
+
+ pos = skip_to_next_field(line, iter->line_pos, len);
+
+ if (pos != iter->line_pos) {
+ iter->line_pos = pos;
+ return TRUE;
+ }
+
+ return g_at_result_iter_next_number(iter, number);
+}
+
gboolean g_at_result_iter_next_range(GAtResultIter *iter, gint *min, gint *max)
{
int pos;
diff --git a/gatchat/gatresult.h b/gatchat/gatresult.h
index a74741f..7803ca1 100644
--- a/gatchat/gatresult.h
+++ b/gatchat/gatresult.h
@@ -58,6 +58,8 @@ gboolean g_at_result_iter_next_string(GAtResultIter *iter, const char
**str);
gboolean g_at_result_iter_next_unquoted_string(GAtResultIter *iter,
const char **str);
gboolean g_at_result_iter_next_number(GAtResultIter *iter, gint *number);
+gboolean g_at_result_iter_next_number_or_void(GAtResultIter *iter,
+ gint *number);
gboolean g_at_result_iter_next_hexstring(GAtResultIter *iter,
const guint8 **str, gint *length);
--
1.7.1
2:56 a.m.
New subject: [PATCH 1/2] gatchat: add g_at_result_iter_next_number_or_void API
Hi Fred,
gatchat/gatresult.c | 25 +++++++++++++++++++++++++
gatchat/gatresult.h | 2 ++
2 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/gatchat/gatresult.c b/gatchat/gatresult.c
index 8a6dfae..0003f0b 100644
--- a/gatchat/gatresult.c
+++ b/gatchat/gatresult.c
@@ -292,6 +292,31 @@ gboolean g_at_result_iter_next_number(GAtResultIter *iter, gint
*number)
return TRUE;
}
+gboolean g_at_result_iter_next_number_or_void(GAtResultIter *iter, gint *number)
+{
+ unsigned int pos;
+ int len;
+ char *line;
+
+ if (iter == NULL)
+ return FALSE;
+
+ if (iter->l == NULL)
+ return FALSE;
+
+ line = iter->l->data;
+ len = strlen(line);
+
+ pos = skip_to_next_field(line, iter->line_pos, len);
+
+ if (pos != iter->line_pos) {
+ iter->line_pos = pos;
+ return TRUE;
+ }
a general assumption is that if you return TRUE, you can assume that the
*number value is filled in properly. This is not the case anymore. So
you might need to give a default value in case it is void.
And that might mean we better do g_at_result_iter_next_number_default()
or something alike.
Or just having a peek function to check for an empty entry ahead before
calling g_at_result_iter_next_number() might be sufficient.
Regards
Marcel
2:46 a.m.
New subject: [PATCH 2/2] emulator: add support of void parameters in CMER
---
src/emulator.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/emulator.c b/src/emulator.c
index 4896ae1..c4bc505 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -312,23 +312,23 @@ static void cmer_cb(GAtServer *server, GAtServerRequestType type,
case G_AT_SERVER_REQUEST_TYPE_SET:
{
GAtResultIter iter;
- int mode;
+ int mode = em->events_mode;
int ind = em->events_ind;
- int val;
+ int val = 0;
g_at_result_iter_init(&iter, result);
g_at_result_iter_next(&iter, "");
/* mode */
- if (g_at_result_iter_next_number(&iter, &mode) == FALSE)
+ if (!g_at_result_iter_next_number_or_void(&iter, &mode))
goto fail;
if ((mode != 0) && (mode != 3))
goto fail;
/* keyp */
- if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
- if (g_at_result_iter_skip_next(&iter) == FALSE)
+ if (!g_at_result_iter_next_number_or_void(&iter, &val)) {
+ if (!g_at_result_iter_skip_next(&iter))
goto done;
goto fail;
}
@@ -337,8 +337,8 @@ static void cmer_cb(GAtServer *server, GAtServerRequestType type,
goto fail;
/* disp */
- if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
- if (g_at_result_iter_skip_next(&iter) == FALSE)
+ if (!g_at_result_iter_next_number_or_void(&iter, &val)) {
+ if (!g_at_result_iter_skip_next(&iter))
goto done;
goto fail;
}
@@ -347,8 +347,8 @@ static void cmer_cb(GAtServer *server, GAtServerRequestType type,
goto fail;
/* ind */
- if (g_at_result_iter_next_number(&iter, &ind) == FALSE) {
- if (g_at_result_iter_skip_next(&iter) == FALSE)
+ if (!g_at_result_iter_next_number_or_void(&iter, &ind)) {
+ if (!g_at_result_iter_skip_next(&iter))
goto done;
goto fail;
}
@@ -357,8 +357,8 @@ static void cmer_cb(GAtServer *server, GAtServerRequestType type,
goto fail;
/* bfr */
- if (g_at_result_iter_next_number(&iter, &val) == FALSE) {
- if (g_at_result_iter_skip_next(&iter) == FALSE)
+ if (!g_at_result_iter_next_number_or_void(&iter, &val)) {
+ if (!g_at_result_iter_skip_next(&iter))
goto done;
goto fail;
}
@@ -367,7 +367,7 @@ static void cmer_cb(GAtServer *server, GAtServerRequestType type,
goto fail;
/* check that bfr is last parameter */
- if (g_at_result_iter_skip_next(&iter) == TRUE)
+ if (g_at_result_iter_skip_next(&iter))
goto fail;
done:
--
1.7.1
4224
days inactive
4224
days old
3 comments
2 participants
participants (2)
-
Frédéric Danis -
Marcel Holtmann