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

broadband-modem-longcheer: fix getting and setting of allowed modes

Browse Source 
When setting allowed modes, a ",2" crept into the MODODR command when
porting the plugin from 0.6.  That shouldn't be there.

When getting allowed modes, 2 is UMTS preferred and 4 is GSM preferred,
which the previous code combined into only UMTS preferred.
This commit is contained in:
Dan Williams
2013-02-15 13:40:01 -06:00
parent 85b67ed8d9
commit 253242256c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/longcheer/mm-broadband-modem-longcheer.c
View File

@@ -67,15 +67,22 @@ load_allowed_modes_finish (MMIfaceModem *self,
mododr = atoi (str); mododr = atoi (str);
switch (mododr) { switch (mododr) {
case 1: case 1:
/* UMTS only */
*allowed = MM_MODEM_MODE_3G; *allowed = MM_MODEM_MODE_3G;
*preferred = MM_MODEM_MODE_NONE; *preferred = MM_MODEM_MODE_NONE;
return TRUE; return TRUE;
case 2: case 2:
case 4: /* UMTS preferred */
*allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G); *allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G);
*preferred = MM_MODEM_MODE_3G; *preferred = MM_MODEM_MODE_3G;
return TRUE; return TRUE;
case 4:
/* GSM preferred */
*allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G);
*preferred = MM_MODEM_MODE_2G;
return TRUE;
case 3: case 3:
/* GSM only */
*allowed = MM_MODEM_MODE_2G; *allowed = MM_MODEM_MODE_2G;
*preferred = MM_MODEM_MODE_NONE; *preferred = MM_MODEM_MODE_NONE;
return TRUE; return TRUE;
@@ -182,7 +189,7 @@ set_allowed_modes (MMIfaceModem *self,
return; return;
} }
command = g_strdup_printf ("+MODODR=%d,2", mododr); command = g_strdup_printf ("+MODODR=%d", mododr);
mm_base_modem_at_command ( mm_base_modem_at_command (
MM_BASE_MODEM (self), MM_BASE_MODEM (self),
command, command,