diff options
author | Aleksander Morgado <aleksander@lanedo.com> | 2012-09-12 13:06:40 +0200 |
---|---|---|
committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-09-14 07:05:26 +0200 |
commit | a66f971a7cdea4bf1d9f6390e12f950f41ee5595 (patch) | |
tree | 91134bf4d00ffd509a8b7112effe2525342cfb88 /plugins | |
parent | fbe01c8d6a22cb95ff74ddefc907e663cdeee710 (diff) |
libmm-common: added common utils from core
Moved the utils to play with binary to hex strings into libmm-common.
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/huawei/mm-broadband-modem-huawei.c | 5 | ||||
-rw-r--r-- | plugins/icera/mm-broadband-bearer-icera.c | 1 | ||||
-rw-r--r-- | plugins/iridium/mm-bearer-iridium.c | 1 | ||||
-rw-r--r-- | plugins/mbm/mm-broadband-bearer-mbm.c | 1 | ||||
-rw-r--r-- | plugins/novatel/mm-broadband-bearer-novatel-lte.c | 1 | ||||
-rw-r--r-- | plugins/option/mm-broadband-bearer-hso.c | 1 | ||||
-rw-r--r-- | plugins/sierra/mm-broadband-bearer-sierra.c | 1 |
7 files changed, 2 insertions, 9 deletions
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c index 0f6cc424..685b5f8c 100644 --- a/plugins/huawei/mm-broadband-modem-huawei.c +++ b/plugins/huawei/mm-broadband-modem-huawei.c @@ -26,7 +26,6 @@ #include "ModemManager.h" #include "mm-log.h" #include "mm-errors-types.h" -#include "mm-utils.h" #include "mm-common-helpers.h" #include "mm-modem-helpers.h" #include "mm-base-modem-at.h" @@ -1096,7 +1095,7 @@ encode (MMIfaceModem3gppUssd *self, } packed = gsm_pack (gsm, len, 0, &packed_len); - hex = utils_bin2hexstr (packed, packed_len); + hex = mm_utils_bin2hexstr (packed, packed_len); g_free (packed); g_free (gsm); @@ -1113,7 +1112,7 @@ decode (MMIfaceModem3gppUssd *self, gsize bin_len; guint32 unpacked_len; - bin = utils_hexstr2bin (reply, &bin_len); + bin = mm_utils_hexstr2bin (reply, &bin_len); unpacked = gsm_unpack ((guint8*) bin, (bin_len * 8) / 7, 0, &unpacked_len); /* if the last character in a 7-byte block is padding, then drop it */ if ((bin_len % 7 == 0) && (unpacked[unpacked_len - 1] == 0x0d)) diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/plugins/icera/mm-broadband-bearer-icera.c index 2fd8ee42..2b9ebb35 100644 --- a/plugins/icera/mm-broadband-bearer-icera.c +++ b/plugins/icera/mm-broadband-bearer-icera.c @@ -31,7 +31,6 @@ #include "mm-log.h" #include "mm-modem-helpers.h" #include "mm-error-helpers.h" -#include "mm-utils.h" G_DEFINE_TYPE (MMBroadbandBearerIcera, mm_broadband_bearer_icera, MM_TYPE_BROADBAND_BEARER); diff --git a/plugins/iridium/mm-bearer-iridium.c b/plugins/iridium/mm-bearer-iridium.c index a3c81d6a..5f3c03cb 100644 --- a/plugins/iridium/mm-bearer-iridium.c +++ b/plugins/iridium/mm-bearer-iridium.c @@ -25,7 +25,6 @@ #include "mm-bearer-iridium.h" #include "mm-base-modem-at.h" -#include "mm-utils.h" #include "mm-log.h" /* Allow up to 200s to get a proper IP connection */ diff --git a/plugins/mbm/mm-broadband-bearer-mbm.c b/plugins/mbm/mm-broadband-bearer-mbm.c index 09853202..08c72846 100644 --- a/plugins/mbm/mm-broadband-bearer-mbm.c +++ b/plugins/mbm/mm-broadband-bearer-mbm.c @@ -38,7 +38,6 @@ #include "mm-broadband-bearer-mbm.h" #include "mm-log.h" #include "mm-modem-helpers.h" -#include "mm-utils.h" G_DEFINE_TYPE (MMBroadbandBearerMbm, mm_broadband_bearer_mbm, MM_TYPE_BROADBAND_BEARER); diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.c b/plugins/novatel/mm-broadband-bearer-novatel-lte.c index bea017fa..f0208ba8 100644 --- a/plugins/novatel/mm-broadband-bearer-novatel-lte.c +++ b/plugins/novatel/mm-broadband-bearer-novatel-lte.c @@ -30,7 +30,6 @@ #include "mm-broadband-bearer-novatel-lte.h" #include "mm-log.h" #include "mm-modem-helpers.h" -#include "mm-utils.h" #define CONNECTION_CHECK_TIMEOUT_SEC 5 diff --git a/plugins/option/mm-broadband-bearer-hso.c b/plugins/option/mm-broadband-bearer-hso.c index 885082ff..4f1c2509 100644 --- a/plugins/option/mm-broadband-bearer-hso.c +++ b/plugins/option/mm-broadband-bearer-hso.c @@ -31,7 +31,6 @@ #include "mm-broadband-bearer-hso.h" #include "mm-log.h" #include "mm-modem-helpers.h" -#include "mm-utils.h" G_DEFINE_TYPE (MMBroadbandBearerHso, mm_broadband_bearer_hso, MM_TYPE_BROADBAND_BEARER); diff --git a/plugins/sierra/mm-broadband-bearer-sierra.c b/plugins/sierra/mm-broadband-bearer-sierra.c index c8ce9c1c..a28feca7 100644 --- a/plugins/sierra/mm-broadband-bearer-sierra.c +++ b/plugins/sierra/mm-broadband-bearer-sierra.c @@ -30,7 +30,6 @@ #include "mm-broadband-bearer-sierra.h" #include "mm-log.h" #include "mm-modem-helpers.h" -#include "mm-utils.h" G_DEFINE_TYPE (MMBroadbandBearerSierra, mm_broadband_bearer_sierra, MM_TYPE_BROADBAND_BEARER); |