aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2014-01-18 14:16:59 +0100
committerAleksander Morgado <aleksander@aleksander.es>2014-01-18 14:16:59 +0100
commit19b0a7e28fa27556db8f09f93c8628a3fa21aeaa (patch)
tree9aba79a10a9fa2e950dcf19e73059abc6f0fa4a4
parent87f0f808bf9282e3de3bfcf7486049ff9b6f6aa8 (diff)
altair-lte: add 'mm' prefix in the exported helper methods
-rw-r--r--plugins/altair/mm-broadband-modem-altair-lte.c4
-rw-r--r--plugins/altair/mm-modem-helpers-altair-lte.c8
-rw-r--r--plugins/altair/mm-modem-helpers-altair-lte.h8
-rw-r--r--plugins/altair/tests/test-modem-helpers-altair-lte.c20
4 files changed, 20 insertions, 20 deletions
diff --git a/plugins/altair/mm-broadband-modem-altair-lte.c b/plugins/altair/mm-broadband-modem-altair-lte.c
index 7c52002d..3dca8607 100644
--- a/plugins/altair/mm-broadband-modem-altair-lte.c
+++ b/plugins/altair/mm-broadband-modem-altair-lte.c
@@ -1229,7 +1229,7 @@ altair_load_internet_cid_ready (MMIfaceModem3gpp *self,
return;
}
- cid = altair_parse_cid (response, &error);
+ cid = mm_altair_parse_cid (response, &error);
if (error) {
g_simple_async_result_take_error (ctx->result, error);
load_subscription_state_context_complete_and_free (ctx);
@@ -1237,7 +1237,7 @@ altair_load_internet_cid_ready (MMIfaceModem3gpp *self,
}
mm_dbg ("Parsing vendor PCO info: %s", ctx->pco_info);
- pco_value = altair_parse_vendor_pco_info (ctx->pco_info, cid, &error);
+ pco_value = mm_altair_parse_vendor_pco_info (ctx->pco_info, cid, &error);
if (error) {
g_simple_async_result_take_error (ctx->result, error);
load_subscription_state_context_complete_and_free (ctx);
diff --git a/plugins/altair/mm-modem-helpers-altair-lte.c b/plugins/altair/mm-modem-helpers-altair-lte.c
index 5d3ac374..e19f147b 100644
--- a/plugins/altair/mm-modem-helpers-altair-lte.c
+++ b/plugins/altair/mm-modem-helpers-altair-lte.c
@@ -71,7 +71,7 @@ mm_altair_parse_ceer_response (const gchar *response,
/* %CGINFO="cid",1 response parser */
guint
-altair_parse_cid (const gchar *response, GError **error)
+mm_altair_parse_cid (const gchar *response, GError **error)
{
GRegex *regex;
GMatchInfo *match_info;
@@ -134,9 +134,9 @@ altair_extract_vzw_pco_value (const gchar *pco_payload, GError **error)
}
guint
-altair_parse_vendor_pco_info (const gchar *pco_info,
- guint cid,
- GError **error)
+mm_altair_parse_vendor_pco_info (const gchar *pco_info,
+ guint cid,
+ GError **error)
{
GRegex *regex;
GMatchInfo *match_info;
diff --git a/plugins/altair/mm-modem-helpers-altair-lte.h b/plugins/altair/mm-modem-helpers-altair-lte.h
index f7ae6301..c6fbf342 100644
--- a/plugins/altair/mm-modem-helpers-altair-lte.h
+++ b/plugins/altair/mm-modem-helpers-altair-lte.h
@@ -24,11 +24,11 @@ gchar *mm_altair_parse_ceer_response (const gchar *response,
GError **error);
/* %CGINFO="cid",1 response parser */
-guint altair_parse_cid (const gchar *response, GError **error);
+guint mm_altair_parse_cid (const gchar *response, GError **error);
/* %PCOINFO response parser */
-guint altair_parse_vendor_pco_info (const gchar *pco_info,
- guint cid,
- GError **error);
+guint mm_altair_parse_vendor_pco_info (const gchar *pco_info,
+ guint cid,
+ GError **error);
#endif /* MM_MODEM_HELPERS_ALTAIR_H */
diff --git a/plugins/altair/tests/test-modem-helpers-altair-lte.c b/plugins/altair/tests/test-modem-helpers-altair-lte.c
index 50f2b205..2df3eefa 100644
--- a/plugins/altair/tests/test-modem-helpers-altair-lte.c
+++ b/plugins/altair/tests/test-modem-helpers-altair-lte.c
@@ -65,8 +65,8 @@ test_ceer (void)
static void
test_parse_cid (void)
{
- g_assert (altair_parse_cid ("%CGINFO: 2", NULL) == 2);
- g_assert (altair_parse_cid ("%CGINFO:blah", NULL) == -1);
+ g_assert (mm_altair_parse_cid ("%CGINFO: 2", NULL) == 2);
+ g_assert (mm_altair_parse_cid ("%CGINFO:blah", NULL) == -1);
}
static void
@@ -75,26 +75,26 @@ test_parse_vendor_pco_info (void)
guint pco_value;
/* Valid PCO values */
- pco_value = altair_parse_vendor_pco_info ("%PCOINFO: 1,3,FF00,13018400", 3, NULL);
+ pco_value = mm_altair_parse_vendor_pco_info ("%PCOINFO: 1,3,FF00,13018400", 3, NULL);
g_assert (pco_value == 0);
- pco_value = altair_parse_vendor_pco_info ("%PCOINFO: 1,3,FF00,13018403", 3, NULL);
+ pco_value = mm_altair_parse_vendor_pco_info ("%PCOINFO: 1,3,FF00,13018403", 3, NULL);
g_assert (pco_value == 3);
- pco_value = altair_parse_vendor_pco_info ("%PCOINFO: 1,3,FF00,13018405", 3, NULL);
+ pco_value = mm_altair_parse_vendor_pco_info ("%PCOINFO: 1,3,FF00,13018405", 3, NULL);
g_assert (pco_value == 5);
/* Different container */
- pco_value = altair_parse_vendor_pco_info ("%PCOINFO: 1,3,F000,13018401", 3, NULL);
+ pco_value = mm_altair_parse_vendor_pco_info ("%PCOINFO: 1,3,F000,13018401", 3, NULL);
g_assert (pco_value == -1);
/* Different CID */
- pco_value = altair_parse_vendor_pco_info ("%PCOINFO: 1,3,FF00,13018401", 1, NULL);
+ pco_value = mm_altair_parse_vendor_pco_info ("%PCOINFO: 1,3,FF00,13018401", 1, NULL);
g_assert (pco_value == -1);
/* Different payload */
- pco_value = altair_parse_vendor_pco_info ("%PCOINFO: 1,3,FF00,13018501", 1, NULL);
+ pco_value = mm_altair_parse_vendor_pco_info ("%PCOINFO: 1,3,FF00,13018501", 1, NULL);
g_assert (pco_value == -1);
/* Bad PCO info */
- pco_value = altair_parse_vendor_pco_info ("%PCOINFO: blah,blah,FF00,13018401", 1, NULL);
+ pco_value = mm_altair_parse_vendor_pco_info ("%PCOINFO: blah,blah,FF00,13018401", 1, NULL);
g_assert (pco_value == -1);
/* Multiline PCO info */
- pco_value = altair_parse_vendor_pco_info ("%PCOINFO: 1,1,FF00,13018400\r\n%PCOINFO: 1,3,FF00,13018403", 3, NULL);
+ pco_value = mm_altair_parse_vendor_pco_info ("%PCOINFO: 1,1,FF00,13018400\r\n%PCOINFO: 1,3,FF00,13018403", 3, NULL);
g_assert (pco_value == 3);
}