Hi Martin,
On 07/03/2019 01:09 PM, Martin Hundebøll wrote:
---
plugins/quectel.c | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/plugins/quectel.c b/plugins/quectel.c
index f99b1ff8..50657265 100644
--- a/plugins/quectel.c
+++ b/plugins/quectel.c
@@ -25,6 +25,7 @@
#include <errno.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <glib.h>
#include <gatchat.h>
@@ -50,8 +51,8 @@ static const char *none_prefix[] = { NULL };
struct quectel_data {
GAtChat *modem;
GAtChat *aux;
- guint cpin_ready;
- gboolean have_sim;
+ size_t cpin_ready;
Hmm, this is tracking a return value from glib. Not sure if you really
want to do that...
At the very least make it a uint32_t.
+ bool have_sim;
};
static void quectel_debug(const char *str, void *user_data)
@@ -97,7 +98,7 @@ static GAtChat *open_device(struct ofono_modem *modem, const
char *key,
return at_util_open_device(modem, key, quectel_debug, debug, NULL);
}
-static void cpin_notify(GAtResult *result, gpointer user_data)
+static void cpin_notify(GAtResult *result, void *user_data)
{
struct ofono_modem *modem = user_data;
struct quectel_data *data = ofono_modem_get_data(modem);
@@ -114,9 +115,9 @@ static void cpin_notify(GAtResult *result, gpointer
user_data)
g_at_result_iter_next_unquoted_string(&iter, &sim_inserted);
if (g_strcmp0(sim_inserted, "NOT INSERTED") != 0)
- data->have_sim = TRUE;
+ data->have_sim = true;
- ofono_modem_set_powered(modem, TRUE);
+ ofono_modem_set_powered(modem, true);
Well, since you're being OCD... ofono_modem_set_powered takes an
ofono_bool_t type. We really should get rid of ofono_bool_t in favor of
stdbool. But for now I would leave this alone...
/* Turn off the radio. */
g_at_chat_send(data->aux, "AT+CFUN=4", none_prefix, NULL, NULL, NULL);
@@ -125,7 +126,7 @@ static void cpin_notify(GAtResult *result, gpointer
user_data)
data->cpin_ready = 0;
}
-static void cpin_query(gboolean ok, GAtResult *result, gpointer user_data)
+static void cpin_query(int ok, GAtResult *result, void *user_data)
This is GAtChat/glib signature, so until we port GAtChat to ell, I'd
leave this alone.
{
DBG("ok %d", ok);
@@ -133,7 +134,7 @@ static void cpin_query(gboolean ok, GAtResult *result, gpointer user_data)
cpin_notify(result, user_data);
}
-static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
+static void cfun_enable(int ok, GAtResult *result, void *user_data)
{
struct ofono_modem *modem = user_data;
struct quectel_data *data = ofono_modem_get_data(modem);
@@ -145,17 +146,17 @@ static void cfun_enable(gboolean ok, GAtResult *result,
gpointer user_data)
data->aux = NULL;
g_at_chat_unref(data->modem);
data->modem = NULL;
- ofono_modem_set_powered(modem, FALSE);
+ ofono_modem_set_powered(modem, false);
return;
}
data->cpin_ready = g_at_chat_register(data->aux, "+CPIN", cpin_notify,
- FALSE, modem, NULL);
+ false, modem, NULL);
g_at_chat_send(data->aux, "AT+CPIN?", cpin_prefix, cpin_query, modem,
NULL);
}
-static void cfun_query(gboolean ok, GAtResult *result, gpointer user_data)
+static void cfun_query(int ok, GAtResult *result, void *user_data)
{
struct ofono_modem *modem = user_data;
struct quectel_data *data = ofono_modem_get_data(modem);
@@ -169,7 +170,7 @@ static void cfun_query(gboolean ok, GAtResult *result,
gpointer user_data)
g_at_result_iter_init(&iter, result);
- if (g_at_result_iter_next(&iter, "+CFUN:") == FALSE)
+ if (g_at_result_iter_next(&iter, "+CFUN:") == false)
return;
g_at_result_iter_next_number(&iter, &status);
@@ -190,7 +191,7 @@ static void cfun_query(gboolean ok, GAtResult *result,
gpointer user_data)
return;
}
- cfun_enable(TRUE, NULL, modem);
+ cfun_enable(true, NULL, modem);
}
static int quectel_enable(struct ofono_modem *modem)
@@ -222,7 +223,7 @@ static int quectel_enable(struct ofono_modem *modem)
return -EINPROGRESS;
}
-static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data)
+static void cfun_disable(int ok, GAtResult *result, void *user_data)
{
struct ofono_modem *modem = user_data;
struct quectel_data *data = ofono_modem_get_data(modem);
@@ -233,7 +234,7 @@ static void cfun_disable(gboolean ok, GAtResult *result,
gpointer user_data)
data->aux = NULL;
if (ok)
- ofono_modem_set_powered(modem, FALSE);
+ ofono_modem_set_powered(modem, false);
}
static int quectel_disable(struct ofono_modem *modem)
@@ -257,7 +258,7 @@ static int quectel_disable(struct ofono_modem *modem)
return -EINPROGRESS;
}
-static void set_online_cb(gboolean ok, GAtResult *result, gpointer user_data)
+static void set_online_cb(int ok, GAtResult *result, void *user_data)
{
struct cb_data *cbd = user_data;
ofono_modem_online_cb_t cb = cbd->cb;
@@ -267,7 +268,7 @@ static void set_online_cb(gboolean ok, GAtResult *result,
gpointer user_data)
cb(&error, cbd->data);
}
-static void quectel_set_online(struct ofono_modem *modem, ofono_bool_t online,
+static void quectel_set_online(struct ofono_modem *modem, int online,
ofono_modem_online_cb_t cb, void *user_data)
{
struct quectel_data *data = ofono_modem_get_data(modem);
@@ -296,8 +297,8 @@ static void quectel_pre_sim(struct ofono_modem *modem)
sim = ofono_sim_create(modem, OFONO_VENDOR_QUECTEL, "atmodem",
data->aux);
- if (sim && data->have_sim == TRUE)
- ofono_sim_inserted_notify(sim, TRUE);
+ if (sim && data->have_sim == true)
+ ofono_sim_inserted_notify(sim, true);
}
static void quectel_post_sim(struct ofono_modem *modem)
Regards,
-Denis
_______________________________________________
ofono mailing list
ofono@ofono.org
https://lists.ofono.org/mailman/listinfo/ofono
