colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api,enums: renamed MMModemAccessTech' to MMModemAccessTechnology'

Browse Source 
This one was the last enum without full name.
This commit is contained in:
Aleksander Morgado
2011-12-20 18:43:43 +01:00
parent b6a3ccd578
commit 516b097331
13 changed files with 166 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/api/mm-sections.txt
View File

@@ -6,7 +6,7 @@ MMModem3gppFacility
MMModem3gppNetworkAvailability MMModem3gppNetworkAvailability
MMModem3gppRegistrationState MMModem3gppRegistrationState
MMModem3gppUssdSessionState MMModem3gppUssdSessionState
MMModemAccessTech MMModemAccessTechnology
MMModemBand MMModemBand
MMModemCapability MMModemCapability
MMModemCdmaActivationError MMModemCdmaActivationError

70
include/ModemManager-enums.h
View File

@@ -133,45 +133,45 @@ typedef enum { /*< underscore_name=mm_modem_state_change_reason >*/
} MMModemStateChangeReason; } MMModemStateChangeReason;
/** /**
* MMModemAccessTech: * MMModemAccessTechnology:
* @MM_MODEM_ACCESS_TECH_UNKNOWN: The access technology used is unknown. * @MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN: The access technology used is unknown.
* @MM_MODEM_ACCESS_TECH_POTS: Analog wireline telephone. * @MM_MODEM_ACCESS_TECHNOLOGY_POTS: Analog wireline telephone.
* @MM_MODEM_ACCESS_TECH_GSM: GSM. * @MM_MODEM_ACCESS_TECHNOLOGY_GSM: GSM.
* @MM_MODEM_ACCESS_TECH_GSM_COMPACT: Compact GSM. * @MM_MODEM_ACCESS_TECHNOLOGY_GSM_COMPACT: Compact GSM.
* @MM_MODEM_ACCESS_TECH_GPRS: GPRS. * @MM_MODEM_ACCESS_TECHNOLOGY_GPRS: GPRS.
* @MM_MODEM_ACCESS_TECH_EDGE: EDGE (ETSI 27.007: "GSM w/EGPRS"). * @MM_MODEM_ACCESS_TECHNOLOGY_EDGE: EDGE (ETSI 27.007: "GSM w/EGPRS").
* @MM_MODEM_ACCESS_TECH_UMTS: UMTS (ETSI 27.007: "UTRAN"). * @MM_MODEM_ACCESS_TECHNOLOGY_UMTS: UMTS (ETSI 27.007: "UTRAN").
* @MM_MODEM_ACCESS_TECH_HSDPA: HSDPA (ETSI 27.007: "UTRAN w/HSDPA"). * @MM_MODEM_ACCESS_TECHNOLOGY_HSDPA: HSDPA (ETSI 27.007: "UTRAN w/HSDPA").
* @MM_MODEM_ACCESS_TECH_HSUPA: HSUPA (ETSI 27.007: "UTRAN w/HSUPA"). * @MM_MODEM_ACCESS_TECHNOLOGY_HSUPA: HSUPA (ETSI 27.007: "UTRAN w/HSUPA").
* @MM_MODEM_ACCESS_TECH_HSPA: HSPA (ETSI 27.007: "UTRAN w/HSDPA and HSUPA"). * @MM_MODEM_ACCESS_TECHNOLOGY_HSPA: HSPA (ETSI 27.007: "UTRAN w/HSDPA and HSUPA").
* @MM_MODEM_ACCESS_TECH_HSPA_PLUS: HSPA+ (ETSI 27.007: "UTRAN w/HSPA+"). * @MM_MODEM_ACCESS_TECHNOLOGY_HSPA_PLUS: HSPA+ (ETSI 27.007: "UTRAN w/HSPA+").
* @MM_MODEM_ACCESS_TECH_1XRTT: CDMA2000 1xRTT. * @MM_MODEM_ACCESS_TECHNOLOGY_1XRTT: CDMA2000 1xRTT.
* @MM_MODEM_ACCESS_TECH_EVDO0: CDMA2000 EVDO revision 0. * @MM_MODEM_ACCESS_TECHNOLOGY_EVDO0: CDMA2000 EVDO revision 0.
* @MM_MODEM_ACCESS_TECH_EVDOA: CDMA2000 EVDO revision A. * @MM_MODEM_ACCESS_TECHNOLOGY_EVDOA: CDMA2000 EVDO revision A.
* @MM_MODEM_ACCESS_TECH_EVDOB: CDMA2000 EVDO revision B. * @MM_MODEM_ACCESS_TECHNOLOGY_EVDOB: CDMA2000 EVDO revision B.
* @MM_MODEM_ACCESS_TECH_LTE: LTE (ETSI 27.007: "E-UTRAN") * @MM_MODEM_ACCESS_TECHNOLOGY_LTE: LTE (ETSI 27.007: "E-UTRAN")
* *
* Describes various access technologies that a device uses when registered with * Describes various access technologies that a device uses when registered with
* or connected to a network. * or connected to a network.
*/ */
typedef enum { /*< underscore_name=mm_modem_access_tech >*/ typedef enum { /*< underscore_name=mm_modem_access_technology >*/
MM_MODEM_ACCESS_TECH_UNKNOWN = 0, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN = 0,
MM_MODEM_ACCESS_TECH_POTS = 1 << 1, MM_MODEM_ACCESS_TECHNOLOGY_POTS = 1 << 1,
MM_MODEM_ACCESS_TECH_GSM = 1 << 2, MM_MODEM_ACCESS_TECHNOLOGY_GSM = 1 << 2,
MM_MODEM_ACCESS_TECH_GSM_COMPACT = 1 << 3, MM_MODEM_ACCESS_TECHNOLOGY_GSM_COMPACT = 1 << 3,
MM_MODEM_ACCESS_TECH_GPRS = 1 << 4, MM_MODEM_ACCESS_TECHNOLOGY_GPRS = 1 << 4,
MM_MODEM_ACCESS_TECH_EDGE = 1 << 5, MM_MODEM_ACCESS_TECHNOLOGY_EDGE = 1 << 5,
MM_MODEM_ACCESS_TECH_UMTS = 1 << 6, MM_MODEM_ACCESS_TECHNOLOGY_UMTS = 1 << 6,
MM_MODEM_ACCESS_TECH_HSDPA = 1 << 7, MM_MODEM_ACCESS_TECHNOLOGY_HSDPA = 1 << 7,
MM_MODEM_ACCESS_TECH_HSUPA = 1 << 8, MM_MODEM_ACCESS_TECHNOLOGY_HSUPA = 1 << 8,
MM_MODEM_ACCESS_TECH_HSPA = 1 << 9, MM_MODEM_ACCESS_TECHNOLOGY_HSPA = 1 << 9,
MM_MODEM_ACCESS_TECH_HSPA_PLUS = 1 << 10, MM_MODEM_ACCESS_TECHNOLOGY_HSPA_PLUS = 1 << 10,
MM_MODEM_ACCESS_TECH_1XRTT = 1 << 11, MM_MODEM_ACCESS_TECHNOLOGY_1XRTT = 1 << 11,
MM_MODEM_ACCESS_TECH_EVDO0 = 1 << 12, MM_MODEM_ACCESS_TECHNOLOGY_EVDO0 = 1 << 12,
MM_MODEM_ACCESS_TECH_EVDOA = 1 << 13, MM_MODEM_ACCESS_TECHNOLOGY_EVDOA = 1 << 13,
MM_MODEM_ACCESS_TECH_EVDOB = 1 << 14, MM_MODEM_ACCESS_TECHNOLOGY_EVDOB = 1 << 14,
MM_MODEM_ACCESS_TECH_LTE = 1 << 15, MM_MODEM_ACCESS_TECHNOLOGY_LTE = 1 << 15,
} MMModemAccessTech; } MMModemAccessTechnology;
/** /**
* MMModemMode: * MMModemMode:

8
libmm-glib/mm-modem.c
View File

@@ -554,14 +554,14 @@ mm_modem_get_state (MMModem *self)
* Gets the current network access technology used by the #MMModem to communicate * Gets the current network access technology used by the #MMModem to communicate
* with the network. * with the network.
* *
* Returns: A ##MMModemAccessTech value. * Returns: A ##MMModemAccessTechnology value.
*/ */
MMModemAccessTech MMModemAccessTechnology
mm_modem_get_access_technologies (MMModem *self) mm_modem_get_access_technologies (MMModem *self)
{ {
g_return_val_if_fail (MM_GDBUS_IS_MODEM (self), MM_MODEM_ACCESS_TECH_UNKNOWN); g_return_val_if_fail (MM_GDBUS_IS_MODEM (self), MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN);
return (MMModemAccessTech) mm_gdbus_modem_get_access_technologies (self); return (MMModemAccessTechnology) mm_gdbus_modem_get_access_technologies (self);
} }
/** /**

2
libmm-glib/mm-modem.h
View File

@@ -64,7 +64,7 @@ gchar *mm_modem_dup_equipment_identifier (MMModem *self);
MMModemLock mm_modem_get_unlock_required (MMModem *self); MMModemLock mm_modem_get_unlock_required (MMModem *self);
guint mm_modem_get_unlock_retries (MMModem *self); guint mm_modem_get_unlock_retries (MMModem *self);
MMModemState mm_modem_get_state (MMModem *self); MMModemState mm_modem_get_state (MMModem *self);
MMModemAccessTech mm_modem_get_access_technologies (MMModem *self); MMModemAccessTechnology mm_modem_get_access_technologies (MMModem *self);
guint mm_modem_get_signal_quality (MMModem *self, guint mm_modem_get_signal_quality (MMModem *self,
gboolean *recent); gboolean *recent);
MMModemMode mm_modem_get_supported_modes (MMModem *self); MMModemMode mm_modem_get_supported_modes (MMModem *self);

4
new/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
View File

@@ -72,9 +72,9 @@
<literal>"31026"</literal> or <literal>"310260"</literal>. <literal>"31026"</literal> or <literal>"310260"</literal>.
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry><term><literal>"access-tech"</literal></term> <varlistentry><term><literal>"access-technology"</literal></term>
<listitem> <listitem>
A <link linkend="MMModemAccessTech">MMModemAccessTech</link> value A <link linkend="MMModemAccessTechnology">MMModemAccessTechnology</link> value
representing the generic access technology used by this mobile network, representing the generic access technology used by this mobile network,
given as an unsigned integer (signature <literal>"u"</literal>). given as an unsigned integer (signature <literal>"u"</literal>).
</listitem> </listitem>

2
new/org.freedesktop.ModemManager1.Modem.Simple.xml
View File

@@ -166,7 +166,7 @@
</varlistentry> </varlistentry>
<varlistentry><term><literal>"access-technology"</literal></term> <varlistentry><term><literal>"access-technology"</literal></term>
<listitem> <listitem>
A <link linkend="MMModemAccessTech">MMModemAccessTech</link> value, A <link linkend="MMModemAccessTechnology">MMModemAccessTechnology</link> value,
given only when registered, as an unsigned integer value given only when registered, as an unsigned integer value
(signature <literal>"u"</literal>). (signature <literal>"u"</literal>).
</listitem> </listitem>

4
new/org.freedesktop.ModemManager1.Modem.xml
View File

@@ -326,12 +326,12 @@
<!-- <!--
AccessTechnologies: AccessTechnologies:
Bitmask of <link linkend="MMModemAccessTech">MMModemAccessTech</link> values, Bitmask of <link linkend="MMModemAccessTechnology">MMModemAccessTechnology</link> values,
specifying the current network access technologies used by the device to communicate specifying the current network access technologies used by the device to communicate
with the network. with the network.
If the device's access technology cannot be determined, If the device's access technology cannot be determined,
<link linkend="MM-MODEM-ACCESS-TECH-UNKNOWN:CAPS"><constant>MM_MODEM_ACCESS_TECH_UNKNOWN</constant></link> <link linkend="MM-MODEM-ACCESS-TECHNOLOGY-UNKNOWN:CAPS"><constant>MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN</constant></link>
will be reported. will be reported.
--> -->
<property name="AccessTechnologies" type="u" access="read" /> <property name="AccessTechnologies" type="u" access="read" />

4
src/mm-broadband-modem.c
View File

@@ -1110,7 +1110,7 @@ reg_state_changed (MMAtSerialPort *port,
{ {
MMModem3gppRegistrationState state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN; MMModem3gppRegistrationState state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN;
gulong lac = 0, cell_id = 0; gulong lac = 0, cell_id = 0;
MMModemAccessTech act = MM_MODEM_ACCESS_TECH_UNKNOWN; MMModemAccessTechnology act = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN;
gboolean cgreg = FALSE; gboolean cgreg = FALSE;
GError *error = NULL; GError *error = NULL;
@@ -1572,7 +1572,7 @@ registration_status_check_ready (MMBroadbandModem *self,
gboolean parsed; gboolean parsed;
gboolean cgreg = FALSE; gboolean cgreg = FALSE;
MMModem3gppRegistrationState state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN; MMModem3gppRegistrationState state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN;
MMModemAccessTech act = MM_MODEM_ACCESS_TECH_UNKNOWN; MMModemAccessTechnology act = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN;
gulong lac = 0; gulong lac = 0;
gulong cid = 0; gulong cid = 0;

2
src/mm-iface-modem-3gpp.c
View File

@@ -170,7 +170,7 @@ scan_networks_build_result (GList *info_list)
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
"status", g_variant_new_uint32 (info->status)); "status", g_variant_new_uint32 (info->status));
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
"access-tech", g_variant_new_uint32 (info->access_tech)); "access-technology", g_variant_new_uint32 (info->access_tech));
if (info->operator_long) if (info->operator_long)
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
"operator-long", g_variant_new_string (info->operator_long)); "operator-long", g_variant_new_string (info->operator_long));

2
src/mm-iface-modem.c
View File

@@ -2202,7 +2202,7 @@ mm_iface_modem_initialize (MMIfaceModem *self,
mm_gdbus_modem_set_equipment_identifier (skeleton, NULL); mm_gdbus_modem_set_equipment_identifier (skeleton, NULL);
mm_gdbus_modem_set_unlock_required (skeleton, MM_MODEM_LOCK_UNKNOWN); mm_gdbus_modem_set_unlock_required (skeleton, MM_MODEM_LOCK_UNKNOWN);
mm_gdbus_modem_set_unlock_retries (skeleton, 0); mm_gdbus_modem_set_unlock_retries (skeleton, 0);
mm_gdbus_modem_set_access_technologies (skeleton, MM_MODEM_ACCESS_TECH_UNKNOWN); mm_gdbus_modem_set_access_technologies (skeleton, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN);
mm_gdbus_modem_set_signal_quality (skeleton, g_variant_new ("(ub)", 0, FALSE)); mm_gdbus_modem_set_signal_quality (skeleton, g_variant_new ("(ub)", 0, FALSE));
mm_gdbus_modem_set_supported_modes (skeleton, MM_MODEM_MODE_NONE); mm_gdbus_modem_set_supported_modes (skeleton, MM_MODEM_MODE_NONE);
mm_gdbus_modem_set_allowed_modes (skeleton, MM_MODEM_MODE_ANY); mm_gdbus_modem_set_allowed_modes (skeleton, MM_MODEM_MODE_ANY);

30
src/mm-modem-helpers.c
View File

@@ -61,29 +61,29 @@ mm_3gpp_network_info_list_free (GList *info_list)
g_list_free (info_list); g_list_free (info_list);
} }
static MMModemAccessTech static MMModemAccessTechnology
get_mm_access_tech_from_etsi_access_tech (guint act) get_mm_access_tech_from_etsi_access_tech (guint act)
{ {
/* See ETSI TS 27.007 */ /* See ETSI TS 27.007 */
switch (act) { switch (act) {
case 0: case 0:
return MM_MODEM_ACCESS_TECH_GSM; return MM_MODEM_ACCESS_TECHNOLOGY_GSM;
case 1: case 1:
return MM_MODEM_ACCESS_TECH_GSM_COMPACT; return MM_MODEM_ACCESS_TECHNOLOGY_GSM_COMPACT;
case 2: case 2:
return MM_MODEM_ACCESS_TECH_UMTS; return MM_MODEM_ACCESS_TECHNOLOGY_UMTS;
case 3: case 3:
return MM_MODEM_ACCESS_TECH_EDGE; return MM_MODEM_ACCESS_TECHNOLOGY_EDGE;
case 4: case 4:
return MM_MODEM_ACCESS_TECH_HSDPA; return MM_MODEM_ACCESS_TECHNOLOGY_HSDPA;
case 5: case 5:
return MM_MODEM_ACCESS_TECH_HSUPA; return MM_MODEM_ACCESS_TECHNOLOGY_HSUPA;
case 6: case 6:
return MM_MODEM_ACCESS_TECH_HSPA; return MM_MODEM_ACCESS_TECHNOLOGY_HSPA;
case 7: case 7:
return MM_MODEM_ACCESS_TECH_LTE; return MM_MODEM_ACCESS_TECHNOLOGY_LTE;
default: default:
return MM_MODEM_ACCESS_TECH_UNKNOWN; return MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN;
} }
} }
@@ -129,7 +129,7 @@ parse_network_status (const gchar *str)
return (MMModem3gppNetworkAvailability) (str[0] - '0'); return (MMModem3gppNetworkAvailability) (str[0] - '0');
} }
static MMModemAccessTech static MMModemAccessTechnology
parse_access_tech (const gchar *str) parse_access_tech (const gchar *str)
{ {
/* Recognized access technologies are between '0' and '7' inclusive... */ /* Recognized access technologies are between '0' and '7' inclusive... */
@@ -138,7 +138,7 @@ parse_access_tech (const gchar *str)
str[0] < '0' || str[0] < '0' ||
str[0] > '7') { str[0] > '7') {
mm_warn ("Cannot parse access tech: '%s'", str); mm_warn ("Cannot parse access tech: '%s'", str);
return MM_MODEM_ACCESS_TECH_UNKNOWN; return MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN;
} }
return get_mm_access_tech_from_etsi_access_tech (str[0] - '0'); return get_mm_access_tech_from_etsi_access_tech (str[0] - '0');
@@ -227,7 +227,7 @@ mm_3gpp_parse_scan_response (const gchar *reply,
} }
network_availability_class = G_ENUM_CLASS (g_type_class_ref (MM_TYPE_MODEM_3GPP_NETWORK_AVAILABILITY)); network_availability_class = G_ENUM_CLASS (g_type_class_ref (MM_TYPE_MODEM_3GPP_NETWORK_AVAILABILITY));
access_tech_class = G_ENUM_CLASS (g_type_class_ref (MM_TYPE_MODEM_ACCESS_TECH)); access_tech_class = G_ENUM_CLASS (g_type_class_ref (MM_TYPE_MODEM_ACCESS_TECHNOLOGY));
/* Parse the results */ /* Parse the results */
while (g_match_info_matches (match_info)) { while (g_match_info_matches (match_info)) {
@@ -252,7 +252,7 @@ mm_3gpp_parse_scan_response (const gchar *reply,
NULL); NULL);
info->access_tech = (tmp ? info->access_tech = (tmp ?
parse_access_tech (tmp) : parse_access_tech (tmp) :
MM_MODEM_ACCESS_TECH_GSM); MM_MODEM_ACCESS_TECHNOLOGY_GSM);
g_free (tmp); g_free (tmp);
/* If the operator number isn't valid (ie, at least 5 digits), /* If the operator number isn't valid (ie, at least 5 digits),
@@ -535,7 +535,7 @@ mm_3gpp_parse_creg_response (GMatchInfo *info,
MMModem3gppRegistrationState *out_reg_state, MMModem3gppRegistrationState *out_reg_state,
gulong *out_lac, gulong *out_lac,
gulong *out_ci, gulong *out_ci,
MMModemAccessTech *out_act, MMModemAccessTechnology *out_act,
gboolean *out_cgreg, gboolean *out_cgreg,
GError **error) GError **error)
{ {

4
src/mm-modem-helpers.h
View File

@@ -28,7 +28,7 @@ typedef struct {
gchar *operator_long; gchar *operator_long;
gchar *operator_short; gchar *operator_short;
gchar *operator_code; /* mandatory */ gchar *operator_code; /* mandatory */
MMModemAccessTech access_tech; MMModemAccessTechnology access_tech;
} MM3gppNetworkInfo; } MM3gppNetworkInfo;
void mm_3gpp_network_info_list_free (GList *info_list); void mm_3gpp_network_info_list_free (GList *info_list);
@@ -52,7 +52,7 @@ gboolean mm_3gpp_parse_creg_response (GMatchInfo *info,
MMModem3gppRegistrationState *out_reg_state, MMModem3gppRegistrationState *out_reg_state,
gulong *out_lac, gulong *out_lac,
gulong *out_ci, gulong *out_ci,
MMModemAccessTech *out_act, MMModemAccessTechnology *out_act,
gboolean *out_cgreg, gboolean *out_cgreg,
GError **error); GError **error);

198
src/tests/test-modem-helpers.c
View File

@@ -81,9 +81,9 @@ test_cops_response_tm506 (void *f, gpointer d)
{ {
const gchar *reply = "+COPS: (2,\"\",\"T-Mobile\",\"31026\",0),(2,\"T - Mobile\",\"T - Mobile\",\"310260\"),2),(1,\"AT&T\",\"AT&T\",\"310410\"),0)"; const gchar *reply = "+COPS: (2,\"\",\"T-Mobile\",\"31026\",0),(2,\"T - Mobile\",\"T - Mobile\",\"310260\"),2),(1,\"AT&T\",\"AT&T\",\"310410\"),0)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, NULL, "T-Mobile", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, NULL, "T-Mobile", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T - Mobile", "T - Mobile", "310260", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T - Mobile", "T - Mobile", "310260", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM } { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM }
}; };
test_cops_results ("TM-506", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("TM-506", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -94,8 +94,8 @@ test_cops_response_gt3gplus (void *f, gpointer d)
{ {
const char *reply = "+COPS: (1,\"T-Mobile US\",\"TMO US\",\"31026\",0),(1,\"Cingular\",\"Cingular\",\"310410\",0),,(0, 1, 3),(0-2)"; const char *reply = "+COPS: (1,\"T-Mobile US\",\"TMO US\",\"31026\",0),(1,\"Cingular\",\"Cingular\",\"310410\",0),,(0, 1, 3),(0-2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile US", "TMO US", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile US", "TMO US", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "Cingular", "Cingular", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "Cingular", "Cingular", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("GlobeTrotter 3G+ (nozomi)", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("GlobeTrotter 3G+ (nozomi)", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -106,9 +106,9 @@ test_cops_response_ac881 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (1,\"T-Mobile\",\"TMO\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),)"; const char *reply = "+COPS: (1,\"T-Mobile\",\"TMO\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Sierra AirCard 881", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Sierra AirCard 881", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -119,9 +119,9 @@ test_cops_response_gtmax36 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile US\",\"TMO US\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0, 1,)"; const char *reply = "+COPS: (2,\"T-Mobile US\",\"TMO US\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0, 1,)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile US", "TMO US", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile US", "TMO US", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Option GlobeTrotter MAX 3.6", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Option GlobeTrotter MAX 3.6", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -132,9 +132,9 @@ test_cops_response_ac860 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile\",\"TMO\",\"31026\",0),(1,\"Cingular\",\"Cinglr\",\"310410\",2),(1,\"Cingular\",\"Cinglr\",\"310410\",0),,)"; const char *reply = "+COPS: (2,\"T-Mobile\",\"TMO\",\"31026\",0),(1,\"Cingular\",\"Cinglr\",\"310410\",2),(1,\"Cingular\",\"Cinglr\",\"310410\",0),,)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "Cingular", "Cinglr", "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "Cingular", "Cinglr", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "Cingular", "Cinglr", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "Cingular", "Cinglr", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Sierra AirCard 860", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Sierra AirCard 860", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -145,9 +145,9 @@ test_cops_response_gtm378 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile\",\"T-Mobile\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0, 1, 3),(0-2)"; const char *reply = "+COPS: (2,\"T-Mobile\",\"T-Mobile\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0, 1, 3),(0-2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "T-Mobile", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "T-Mobile", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Option GTM378", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Option GTM378", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -158,8 +158,8 @@ test_cops_response_motoc (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile\",\"\",\"310260\"),(0,\"Cingular Wireless\",\"\",\"310410\")"; const char *reply = "+COPS: (2,\"T-Mobile\",\"\",\"310260\"),(0,\"Cingular Wireless\",\"\",\"310410\")";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", NULL, "310260", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", NULL, "310260", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_UNKNOWN, "Cingular Wireless", NULL, "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_UNKNOWN, "Cingular Wireless", NULL, "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("BUSlink SCWi275u (Motorola C-series)", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("BUSlink SCWi275u (Motorola C-series)", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -170,8 +170,8 @@ test_cops_response_mf627a (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"AT&T@\",\"AT&TD\",\"310410\",0),(3,\"Voicestream Wireless Corporation\",\"VSTREAM\",\"31026\",0),"; const char *reply = "+COPS: (2,\"AT&T@\",\"AT&TD\",\"310410\",0),(3,\"Voicestream Wireless Corporation\",\"VSTREAM\",\"31026\",0),";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "AT&T@", "AT&TD", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "AT&T@", "AT&TD", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, "Voicestream Wireless Corporation", "VSTREAM", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, "Voicestream Wireless Corporation", "VSTREAM", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("ZTE MF627 (A)", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("ZTE MF627 (A)", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -182,8 +182,8 @@ test_cops_response_mf627b (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"AT&Tp\",\"AT&T@\",\"310410\",0),(3,\"\",\"\",\"31026\",0),"; const char *reply = "+COPS: (2,\"AT&Tp\",\"AT&T@\",\"310410\",0),(3,\"\",\"\",\"31026\",0),";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "AT&Tp", "AT&T@", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "AT&Tp", "AT&T@", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("ZTE MF627 (B)", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("ZTE MF627 (B)", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -194,8 +194,8 @@ test_cops_response_e160g (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile\",\"TMO\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)"; const char *reply = "+COPS: (2,\"T-Mobile\",\"TMO\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Huawei E160G", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Huawei E160G", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -206,9 +206,9 @@ test_cops_response_mercury (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"\",\"\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),(1,\"T-Mobile\",\"TMO\",\"31026\",0),,(0,1,2,3,4),(0,1,2)"; const char *reply = "+COPS: (2,\"\",\"\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),(1,\"T-Mobile\",\"TMO\",\"31026\",0),,(0,1,2,3,4),(0,1,2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, NULL, NULL, "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, NULL, NULL, "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Sierra AT&T USBConnect Mercury", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Sierra AT&T USBConnect Mercury", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -219,9 +219,9 @@ test_cops_response_quicksilver (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"AT&T\",\"\",\"310410\",0),(2,\"\",\"\",\"3104100\",2),(1,\"AT&T\",\"\",\"310260\",0),,(0-4),(0-2)"; const char *reply = "+COPS: (2,\"AT&T\",\"\",\"310410\",0),(2,\"\",\"\",\"3104100\",2),(1,\"AT&T\",\"\",\"310260\",0),,(0-4),(0-2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "AT&T", NULL, "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "AT&T", NULL, "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, NULL, NULL, "3104100", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, NULL, NULL, "3104100", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", NULL, "310260", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", NULL, "310260", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Option AT&T Quicksilver", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Option AT&T Quicksilver", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -232,8 +232,8 @@ test_cops_response_icon225 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile US\",\"TMO US\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0, 1, 3),(0-2)"; const char *reply = "+COPS: (2,\"T-Mobile US\",\"TMO US\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0, 1, 3),(0-2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile US", "TMO US", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile US", "TMO US", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Option iCON 225", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Option iCON 225", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -244,10 +244,10 @@ test_cops_response_icon452 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (1,\"T-Mobile US\",\"TMO US\",\"31026\",0),(2,\"T-Mobile\",\"T-Mobile\",\"310260\",2),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)"; const char *reply = "+COPS: (1,\"T-Mobile US\",\"TMO US\",\"31026\",0),(2,\"T-Mobile\",\"T-Mobile\",\"310260\",2),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile US", "TMO US", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile US", "TMO US", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "T-Mobile", "310260", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "T-Mobile", "310260", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM } { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM }
}; };
test_cops_results ("Option iCON 452", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Option iCON 452", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -258,9 +258,9 @@ test_cops_response_f3507g (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T - Mobile\",\"T - Mobile\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2)"; const char *reply = "+COPS: (2,\"T - Mobile\",\"T - Mobile\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T - Mobile", "T - Mobile", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T - Mobile", "T - Mobile", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_UMTS } { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS }
}; };
test_cops_results ("Ericsson F3507g", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Ericsson F3507g", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -271,9 +271,9 @@ test_cops_response_f3607gw (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T - Mobile\",\"T - Mobile\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\"),2),(1,\"AT&T\",\"AT&T\",\"310410\"),0)"; const char *reply = "+COPS: (2,\"T - Mobile\",\"T - Mobile\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\"),2),(1,\"AT&T\",\"AT&T\",\"310410\"),0)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T - Mobile", "T - Mobile", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T - Mobile", "T - Mobile", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM } { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM }
}; };
test_cops_results ("Ericsson F3607gw", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Ericsson F3607gw", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -284,9 +284,9 @@ test_cops_response_mc8775 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile\",\"T-Mobile\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)"; const char *reply = "+COPS: (2,\"T-Mobile\",\"T-Mobile\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "T-Mobile", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "T-Mobile", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM } { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM }
}; };
test_cops_results ("Sierra MC8775", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Sierra MC8775", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -297,9 +297,9 @@ test_cops_response_n80 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T - Mobile\",,\"31026\"),(1,\"Einstein PCS\",,\"31064\"),(1,\"Cingular\",,\"31041\"),,(0,1,3),(0,2)"; const char *reply = "+COPS: (2,\"T - Mobile\",,\"31026\"),(1,\"Einstein PCS\",,\"31064\"),(1,\"Cingular\",,\"31041\"),,(0,1,3),(0,2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T - Mobile", NULL, "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T - Mobile", NULL, "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "Einstein PCS", NULL, "31064", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "Einstein PCS", NULL, "31064", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "Cingular", NULL, "31041", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "Cingular", NULL, "31041", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Nokia N80", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Nokia N80", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -310,8 +310,8 @@ test_cops_response_e1550 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile\",\"TMO\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)"; const char *reply = "+COPS: (2,\"T-Mobile\",\"TMO\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Huawei E1550", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Huawei E1550", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -322,8 +322,8 @@ test_cops_response_mf622 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile\",\"T-Mobile\",\"31026\",0),(1,\"\",\"\",\"310410\",0),"; const char *reply = "+COPS: (2,\"T-Mobile\",\"T-Mobile\",\"31026\",0),(1,\"\",\"\",\"310410\",0),";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "T-Mobile", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "T-Mobile", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, NULL, NULL, "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, NULL, NULL, "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("ZTE MF622", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("ZTE MF622", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -334,9 +334,9 @@ test_cops_response_e226 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (1,\"\",\"\",\"31026\",0),(1,\"\",\"\",\"310410\",2),(1,\"\",\"\",\"310410\",0),,(0,1,3,4),(0,1,2)"; const char *reply = "+COPS: (1,\"\",\"\",\"31026\",0),(1,\"\",\"\",\"310410\",2),(1,\"\",\"\",\"310410\",0),,(0,1,3,4),(0,1,2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, NULL, NULL, "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, NULL, NULL, "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, NULL, NULL, "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, NULL, NULL, "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, NULL, NULL, "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, NULL, NULL, "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Huawei E226", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Huawei E226", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -347,9 +347,9 @@ test_cops_response_xu870 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (0,\"AT&T MicroCell\",\"AT&T MicroCell\",\"310410\",2)\r\n+COPS: (1,\"AT&T MicroCell\",\"AT&T MicroCell\",\"310410\",0)\r\n+COPS: (1,\"T-Mobile\",\"TMO\",\"31026\",0)\r\n"; const char *reply = "+COPS: (0,\"AT&T MicroCell\",\"AT&T MicroCell\",\"310410\",2)\r\n+COPS: (1,\"AT&T MicroCell\",\"AT&T MicroCell\",\"310410\",0)\r\n+COPS: (1,\"T-Mobile\",\"TMO\",\"31026\",0)\r\n";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_UNKNOWN, "AT&T MicroCell", "AT&T MicroCell", "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_UNKNOWN, "AT&T MicroCell", "AT&T MicroCell", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T MicroCell", "AT&T MicroCell", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T MicroCell", "AT&T MicroCell", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile", "TMO", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Novatel XU870", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Novatel XU870", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -360,9 +360,9 @@ test_cops_response_gtultraexpress (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile US\",\"TMO US\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)"; const char *reply = "+COPS: (2,\"T-Mobile US\",\"TMO US\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile US", "TMO US", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile US", "TMO US", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Option GlobeTrotter Ultra Express", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Option GlobeTrotter Ultra Express", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -373,8 +373,8 @@ test_cops_response_n2720 (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T - Mobile\",,\"31026\",0),\r\n(1,\"AT&T\",,\"310410\",0),,(0,1,3),(0,2)"; const char *reply = "+COPS: (2,\"T - Mobile\",,\"31026\",0),\r\n(1,\"AT&T\",,\"310410\",0),,(0,1,3),(0,2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T - Mobile", NULL, "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T - Mobile", NULL, "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", NULL, "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", NULL, "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Nokia 2720", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Nokia 2720", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -385,9 +385,9 @@ test_cops_response_gobi (void *f, gpointer d)
{ {
const char *reply = "+COPS: (2,\"T-Mobile\",\"T-Mobile\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)"; const char *reply = "+COPS: (2,\"T-Mobile\",\"T-Mobile\",\"31026\",0),(1,\"AT&T\",\"AT&T\",\"310410\",2),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "T-Mobile", "31026", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "T-Mobile", "T-Mobile", "31026", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_UMTS }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_UMTS },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Qualcomm Gobi", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Qualcomm Gobi", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -402,13 +402,13 @@ test_cops_response_sek600i (void *f, gpointer d)
*/ */
const char *reply = "+COPS: (2,\"blau\",\"\",\"26203\"),(2,\"blau\",\"\",\"26203\"),(3,\"\",\"\",\"26201\"),(3,\"\",\"\",\"26202\"),(3,\"\",\"\",\"26207\"),(3,\"\",\"\",\"26201\"),(3,\"\",\"\",\"26207\")"; const char *reply = "+COPS: (2,\"blau\",\"\",\"26203\"),(2,\"blau\",\"\",\"26203\"),(3,\"\",\"\",\"26201\"),(3,\"\",\"\",\"26202\"),(3,\"\",\"\",\"26207\"),(3,\"\",\"\",\"26201\"),(3,\"\",\"\",\"26207\")";
static MM3gppNetworkInfo expected[] = { static MM3gppNetworkInfo expected[] = {
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "blau", NULL, "26203", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "blau", NULL, "26203", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "blau", NULL, "26203", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT, "blau", NULL, "26203", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "26201", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "26201", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "26202", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "26202", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "26207", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "26207", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "26201", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "26201", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
{ MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "26207", MM_MODEM_ACCESS_TECH_GSM }, { MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN, NULL, NULL, "26207", MM_MODEM_ACCESS_TECHNOLOGY_GSM },
}; };
test_cops_results ("Sony-Ericsson K600i", reply, &expected[0], G_N_ELEMENTS (expected)); test_cops_results ("Sony-Ericsson K600i", reply, &expected[0], G_N_ELEMENTS (expected));
@@ -442,7 +442,7 @@ typedef struct {
MMModem3gppRegistrationState state; MMModem3gppRegistrationState state;
gulong lac; gulong lac;
gulong ci; gulong ci;
MMModemAccessTech act; MMModemAccessTechnology act;
guint regex_num; guint regex_num;
gboolean cgreg; gboolean cgreg;
@@ -458,7 +458,7 @@ test_creg_match (const char *test,
int i; int i;
GMatchInfo *info = NULL; GMatchInfo *info = NULL;
MMModem3gppRegistrationState state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN; MMModem3gppRegistrationState state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN;
MMModemAccessTech access_tech = MM_MODEM_ACCESS_TECH_UNKNOWN; MMModemAccessTechnology access_tech = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN;
gulong lac = 0, ci = 0; gulong lac = 0, ci = 0;
GError *error = NULL; GError *error = NULL;
gboolean success, cgreg = FALSE; gboolean success, cgreg = FALSE;
@@ -513,7 +513,7 @@ test_creg1_solicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "+CREG: 1,3"; const char *reply = "+CREG: 1,3";
const CregResult result = { 3, 0, 0, MM_MODEM_ACCESS_TECH_UNKNOWN , 2, FALSE}; const CregResult result = { 3, 0, 0, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 2, FALSE};
test_creg_match ("CREG=1", TRUE, reply, data, &result); test_creg_match ("CREG=1", TRUE, reply, data, &result);
} }
@@ -523,7 +523,7 @@ test_creg1_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CREG: 3\r\n"; const char *reply = "\r\n+CREG: 3\r\n";
const CregResult result = { 3, 0, 0, MM_MODEM_ACCESS_TECH_UNKNOWN , 1, FALSE}; const CregResult result = { 3, 0, 0, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 1, FALSE};
test_creg_match ("CREG=1", FALSE, reply, data, &result); test_creg_match ("CREG=1", FALSE, reply, data, &result);
} }
@@ -533,7 +533,7 @@ test_creg2_mercury_solicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "+CREG: 0,1,84CD,00D30173"; const char *reply = "+CREG: 0,1,84CD,00D30173";
const CregResult result = { 1, 0x84cd, 0xd30173, MM_MODEM_ACCESS_TECH_UNKNOWN , 4, FALSE}; const CregResult result = { 1, 0x84cd, 0xd30173, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 4, FALSE};
test_creg_match ("Sierra Mercury CREG=2", TRUE, reply, data, &result); test_creg_match ("Sierra Mercury CREG=2", TRUE, reply, data, &result);
} }
@@ -543,7 +543,7 @@ test_creg2_mercury_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CREG: 1,84CD,00D30156\r\n"; const char *reply = "\r\n+CREG: 1,84CD,00D30156\r\n";
const CregResult result = { 1, 0x84cd, 0xd30156, MM_MODEM_ACCESS_TECH_UNKNOWN , 3, FALSE}; const CregResult result = { 1, 0x84cd, 0xd30156, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 3, FALSE};
test_creg_match ("Sierra Mercury CREG=2", FALSE, reply, data, &result); test_creg_match ("Sierra Mercury CREG=2", FALSE, reply, data, &result);
} }
@@ -553,7 +553,7 @@ test_creg2_sek850i_solicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "+CREG: 2,1,\"CE00\",\"01CEAD8F\""; const char *reply = "+CREG: 2,1,\"CE00\",\"01CEAD8F\"";
const CregResult result = { 1, 0xce00, 0x01cead8f, MM_MODEM_ACCESS_TECH_UNKNOWN , 4, FALSE}; const CregResult result = { 1, 0xce00, 0x01cead8f, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 4, FALSE};
test_creg_match ("Sony Ericsson K850i CREG=2", TRUE, reply, data, &result); test_creg_match ("Sony Ericsson K850i CREG=2", TRUE, reply, data, &result);
} }
@@ -563,7 +563,7 @@ test_creg2_sek850i_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CREG: 1,\"CE00\",\"00005449\"\r\n"; const char *reply = "\r\n+CREG: 1,\"CE00\",\"00005449\"\r\n";
const CregResult result = { 1, 0xce00, 0x5449, MM_MODEM_ACCESS_TECH_UNKNOWN , 3, FALSE}; const CregResult result = { 1, 0xce00, 0x5449, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 3, FALSE};
test_creg_match ("Sony Ericsson K850i CREG=2", FALSE, reply, data, &result); test_creg_match ("Sony Ericsson K850i CREG=2", FALSE, reply, data, &result);
} }
@@ -573,7 +573,7 @@ test_creg2_e160g_solicited_unregistered (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "+CREG: 2,0,00,0"; const char *reply = "+CREG: 2,0,00,0";
const CregResult result = { 0, 0, 0, MM_MODEM_ACCESS_TECH_UNKNOWN , 4, FALSE}; const CregResult result = { 0, 0, 0, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 4, FALSE};
test_creg_match ("Huawei E160G unregistered CREG=2", TRUE, reply, data, &result); test_creg_match ("Huawei E160G unregistered CREG=2", TRUE, reply, data, &result);
} }
@@ -583,7 +583,7 @@ test_creg2_e160g_solicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "+CREG: 2,1,8BE3,2BAF"; const char *reply = "+CREG: 2,1,8BE3,2BAF";
const CregResult result = { 1, 0x8be3, 0x2baf, MM_MODEM_ACCESS_TECH_UNKNOWN , 4, FALSE}; const CregResult result = { 1, 0x8be3, 0x2baf, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 4, FALSE};
test_creg_match ("Huawei E160G CREG=2", TRUE, reply, data, &result); test_creg_match ("Huawei E160G CREG=2", TRUE, reply, data, &result);
} }
@@ -593,7 +593,7 @@ test_creg2_e160g_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CREG: 2,8BE3,2BAF\r\n"; const char *reply = "\r\n+CREG: 2,8BE3,2BAF\r\n";
const CregResult result = { 2, 0x8be3, 0x2baf, MM_MODEM_ACCESS_TECH_UNKNOWN , 3, FALSE}; const CregResult result = { 2, 0x8be3, 0x2baf, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 3, FALSE};
test_creg_match ("Huawei E160G CREG=2", FALSE, reply, data, &result); test_creg_match ("Huawei E160G CREG=2", FALSE, reply, data, &result);
} }
@@ -603,7 +603,7 @@ test_creg2_tm506_solicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "+CREG: 2,1,\"8BE3\",\"00002BAF\""; const char *reply = "+CREG: 2,1,\"8BE3\",\"00002BAF\"";
const CregResult result = { 1, 0x8BE3, 0x2BAF, MM_MODEM_ACCESS_TECH_UNKNOWN , 4, FALSE}; const CregResult result = { 1, 0x8BE3, 0x2BAF, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 4, FALSE};
/* Test leading zeros in the CI */ /* Test leading zeros in the CI */
test_creg_match ("Sony Ericsson TM-506 CREG=2", TRUE, reply, data, &result); test_creg_match ("Sony Ericsson TM-506 CREG=2", TRUE, reply, data, &result);
@@ -614,7 +614,7 @@ test_creg2_xu870_unsolicited_unregistered (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CREG: 2,,\r\n"; const char *reply = "\r\n+CREG: 2,,\r\n";
const CregResult result = { 2, 0, 0, MM_MODEM_ACCESS_TECH_UNKNOWN , 3, FALSE}; const CregResult result = { 2, 0, 0, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 3, FALSE};
test_creg_match ("Novatel XU870 unregistered CREG=2", FALSE, reply, data, &result); test_creg_match ("Novatel XU870 unregistered CREG=2", FALSE, reply, data, &result);
} }
@@ -634,7 +634,7 @@ test_cgreg1_solicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "+CGREG: 1,3"; const char *reply = "+CGREG: 1,3";
const CregResult result = { 3, 0, 0, MM_MODEM_ACCESS_TECH_UNKNOWN , 2, TRUE}; const CregResult result = { 3, 0, 0, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 2, TRUE};
test_creg_match ("CGREG=1", TRUE, reply, data, &result); test_creg_match ("CGREG=1", TRUE, reply, data, &result);
} }
@@ -644,7 +644,7 @@ test_cgreg1_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CGREG: 3\r\n"; const char *reply = "\r\n+CGREG: 3\r\n";
const CregResult result = { 3, 0, 0, MM_MODEM_ACCESS_TECH_UNKNOWN , 1, TRUE}; const CregResult result = { 3, 0, 0, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 1, TRUE};
test_creg_match ("CGREG=1", FALSE, reply, data, &result); test_creg_match ("CGREG=1", FALSE, reply, data, &result);
} }
@@ -654,7 +654,7 @@ test_cgreg2_f3607gw_solicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "+CGREG: 2,1,\"8BE3\",\"00002B5D\",3"; const char *reply = "+CGREG: 2,1,\"8BE3\",\"00002B5D\",3";
const CregResult result = { 1, 0x8BE3, 0x2B5D, MM_MODEM_ACCESS_TECH_EDGE , 6, TRUE}; const CregResult result = { 1, 0x8BE3, 0x2B5D, MM_MODEM_ACCESS_TECHNOLOGY_EDGE , 6, TRUE};
test_creg_match ("Ericsson F3607gw CGREG=2", TRUE, reply, data, &result); test_creg_match ("Ericsson F3607gw CGREG=2", TRUE, reply, data, &result);
} }
@@ -664,7 +664,7 @@ test_cgreg2_f3607gw_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CGREG: 1,\"8BE3\",\"00002B5D\",3\r\n"; const char *reply = "\r\n+CGREG: 1,\"8BE3\",\"00002B5D\",3\r\n";
const CregResult result = { 1, 0x8BE3, 0x2B5D, MM_MODEM_ACCESS_TECH_EDGE , 5, TRUE}; const CregResult result = { 1, 0x8BE3, 0x2B5D, MM_MODEM_ACCESS_TECHNOLOGY_EDGE , 5, TRUE};
test_creg_match ("Ericsson F3607gw CGREG=2", FALSE, reply, data, &result); test_creg_match ("Ericsson F3607gw CGREG=2", FALSE, reply, data, &result);
} }
@@ -674,7 +674,7 @@ test_creg2_md400_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CREG: 2,5,\"0502\",\"0404736D\"\r\n"; const char *reply = "\r\n+CREG: 2,5,\"0502\",\"0404736D\"\r\n";
const CregResult result = { 5, 0x0502, 0x0404736D, MM_MODEM_ACCESS_TECH_UNKNOWN , 4, FALSE}; const CregResult result = { 5, 0x0502, 0x0404736D, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN , 4, FALSE};
test_creg_match ("Sony-Ericsson MD400 CREG=2", FALSE, reply, data, &result); test_creg_match ("Sony-Ericsson MD400 CREG=2", FALSE, reply, data, &result);
} }
@@ -684,7 +684,7 @@ test_cgreg2_md400_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CGREG: 5,\"0502\",\"0404736D\",2\r\n"; const char *reply = "\r\n+CGREG: 5,\"0502\",\"0404736D\",2\r\n";
const CregResult result = { 5, 0x0502, 0x0404736D, MM_MODEM_ACCESS_TECH_UMTS, 5, TRUE}; const CregResult result = { 5, 0x0502, 0x0404736D, MM_MODEM_ACCESS_TECHNOLOGY_UMTS, 5, TRUE};
test_creg_match ("Sony-Ericsson MD400 CGREG=2", FALSE, reply, data, &result); test_creg_match ("Sony-Ericsson MD400 CGREG=2", FALSE, reply, data, &result);
} }
@@ -694,7 +694,7 @@ test_creg_cgreg_multi_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CREG: 5\r\n\r\n+CGREG: 0\r\n"; const char *reply = "\r\n+CREG: 5\r\n\r\n+CGREG: 0\r\n";
const CregResult result = { 5, 0, 0, MM_MODEM_ACCESS_TECH_UNKNOWN, 1, FALSE}; const CregResult result = { 5, 0, 0, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN, 1, FALSE};
test_creg_match ("Multi CREG/CGREG", FALSE, reply, data, &result); test_creg_match ("Multi CREG/CGREG", FALSE, reply, data, &result);
} }
@@ -704,7 +704,7 @@ test_creg_cgreg_multi2_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CGREG: 0\r\n\r\n+CREG: 5\r\n"; const char *reply = "\r\n+CGREG: 0\r\n\r\n+CREG: 5\r\n";
const CregResult result = { 0, 0, 0, MM_MODEM_ACCESS_TECH_UNKNOWN, 1, TRUE}; const CregResult result = { 0, 0, 0, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN, 1, TRUE};
test_creg_match ("Multi CREG/CGREG #2", FALSE, reply, data, &result); test_creg_match ("Multi CREG/CGREG #2", FALSE, reply, data, &result);
} }
@@ -714,7 +714,7 @@ test_cgreg2_x220_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CGREG: 2,1, 81ED, 1A9CEB\r\n"; const char *reply = "\r\n+CGREG: 2,1, 81ED, 1A9CEB\r\n";
const CregResult result = { 1, 0x81ED, 0x1A9CEB, MM_MODEM_ACCESS_TECH_UNKNOWN, 4, TRUE}; const CregResult result = { 1, 0x81ED, 0x1A9CEB, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN, 4, TRUE};
/* Tests random spaces in response */ /* Tests random spaces in response */
test_creg_match ("Alcatel One-Touch X220D CGREG=2", FALSE, reply, data, &result); test_creg_match ("Alcatel One-Touch X220D CGREG=2", FALSE, reply, data, &result);
@@ -725,7 +725,7 @@ test_creg2_s8500_wave_unsolicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CREG: 2,1,000B,2816, B, C2816\r\n"; const char *reply = "\r\n+CREG: 2,1,000B,2816, B, C2816\r\n";
const CregResult result = { 1, 0x000B, 0x2816, MM_MODEM_ACCESS_TECH_GSM, 7, FALSE}; const CregResult result = { 1, 0x000B, 0x2816, MM_MODEM_ACCESS_TECHNOLOGY_GSM, 7, FALSE};
test_creg_match ("Samsung Wave S8500 CREG=2", FALSE, reply, data, &result); test_creg_match ("Samsung Wave S8500 CREG=2", FALSE, reply, data, &result);
} }
@@ -735,7 +735,7 @@ test_creg2_gobi_weird_solicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CREG: 2,1, 0 5, 2715\r\n"; const char *reply = "\r\n+CREG: 2,1, 0 5, 2715\r\n";
const CregResult result = { 1, 0x0000, 0x2715, MM_MODEM_ACCESS_TECH_UNKNOWN, 4, FALSE}; const CregResult result = { 1, 0x0000, 0x2715, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN, 4, FALSE};
test_creg_match ("Qualcomm Gobi 1000 CREG=2", TRUE, reply, data, &result); test_creg_match ("Qualcomm Gobi 1000 CREG=2", TRUE, reply, data, &result);
} }
@@ -745,7 +745,7 @@ test_cgreg2_unsolicited_with_rac (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "\r\n+CGREG: 1,\"1422\",\"00000142\",3,\"00\"\r\n"; const char *reply = "\r\n+CGREG: 1,\"1422\",\"00000142\",3,\"00\"\r\n";
const CregResult result = { 1, 0x1422, 0x0142, MM_MODEM_ACCESS_TECH_EDGE, 8, TRUE }; const CregResult result = { 1, 0x1422, 0x0142, MM_MODEM_ACCESS_TECHNOLOGY_EDGE, 8, TRUE };
test_creg_match ("CGREG=2 with RAC", FALSE, reply, data, &result); test_creg_match ("CGREG=2 with RAC", FALSE, reply, data, &result);
} }