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

broadband-modem: use several SIM errors to flag the modem as GSM/UMTS

Browse Source 
When using CPIN? to detect capabilities, use several possible +CME
errors as indication that the modem is at least GSM/UMTS.

E.g. to avoid situations like this one where the modem doesn't even
get into Failed state as we cannot gather capabilities:

  debug_log(): (ttyMux1): --> 'AT+GCAP<CR>'
  debug_log(): (ttyMux1): <-- '<CR><LF>+CME ERROR: 100<CR><LF>'
  mm_serial_parser_v1_parse(): Got failure code 100: Unknown error
  debug_log(): (ttyMux1): --> 'ATI<CR>'
  debug_log(): (ttyMux1): <-- '<CR><LF>Cinterion<CR><LF>EHS5-E<CR><LF>REVISION 03.001<CR><LF><CR><LF>OK<CR><LF>'
  debug_log(): (ttyMux1): --> 'AT+CPIN?<CR>'
  debug_log(): (ttyMux1): <-- '<CR><LF>+CME ERROR: 10<CR><LF>'
  mm_serial_parser_v1_parse(): Got failure code 10: SIM not inserted
  debug_log(): (ttyMux1): --> 'AT+CGMM<CR>'
  debug_log(): (ttyMux1): <-- '<CR><LF>EHS5-E<CR><LF>'
  debug_log(): (ttyMux1): <-- '<CR><LF>OK<CR><LF>'
  iface_modem_initialize_ready(): Modem couldn't be initialized: couldn't load current capabilities: Failed to determine modem capabilities.
This commit is contained in:
Aleksander Morgado
2017-11-07 19:13:19 +01:00
parent ce8c703574
commit 66dce6dacc
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -481,8 +481,18 @@ parse_caps_cpin (MMBaseModem *self,
GVariant **result,
GError **result_error)
{
if (!response)
if (!response) {
if (error &&
(g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_NOT_INSERTED) ||
g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_FAILURE) ||
g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_BUSY) ||
g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_WRONG))) {
/* At least, it's a GSM modem */
*result = g_variant_new_uint32 (MM_MODEM_CAPABILITY_GSM_UMTS);
return TRUE;
}
return FALSE;
}
if (strcasestr (response, "SIM PIN") ||
strcasestr (response, "SIM PUK") ||