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

sierra: fix ICCID requests

Browse Source 
Depending on when the core requested the ICCID, the port may or may
not be open.  Stuff that needs an open serial port needs to make sure
that the port gets opened itself.
This commit is contained in:
Dan Williams
2010-10-25 21:00:26 -05:00
parent 1684d8b173
commit f93e24dda3
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/mm-modem-sierra-gsm.c
View File

@@ -293,26 +293,33 @@ get_sim_iccid_done (MMAtSerialPort *port,
}
done:
mm_serial_port_close (MM_SERIAL_PORT (port));
mm_callback_info_schedule (info);
}
static void
get_sim_iccid (MMGenericGsm *modem,
MMModemStringFn callback,
gpointer user_data)
gpointer callback_data)
{
MMAtSerialPort *port;
MMCallbackInfo *info;
GError *error = NULL;
info = mm_callback_info_string_new (MM_MODEM (modem), callback, user_data);
port = mm_generic_gsm_get_best_at_port (modem, &error);
if (!port)
goto error;
port = mm_generic_gsm_get_best_at_port (modem, &info->error);
if (!port) {
mm_callback_info_schedule (info);
return;
}
if (!mm_serial_port_open (MM_SERIAL_PORT (port), &error))
goto error;
info = mm_callback_info_string_new (MM_MODEM (modem), callback, callback_data);
mm_at_serial_port_queue_command (port, "!ICCID?", 3, get_sim_iccid_done, info);
return;
error:
callback (MM_MODEM (modem), NULL, error, callback_data);
g_clear_error (&error);
}
/*****************************************************************************/