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

novatel-lte: skip soft reset if modem is newly plugged in

Browse Source 
Soft resetting a Novatel LTE modem can a significant amount of time
(3-4 seconds). If the modem is newly plugged in, skip the unnecessary
soft reset when enabling the modem.
This commit is contained in:
Ben Chan
2013-01-18 11:27:58 +01:00
committed by Aleksander Morgado
parent e75dba639f
commit 9474654f67
1 changed files with 108 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/novatel/mm-broadband-modem-novatel-lte.c
+108
View File
@@ -42,6 +42,112 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemNovatelLte, mm_broadband_modem_novatel_l
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init));
/*****************************************************************************/
/* Initializing the modem (Modem interface) */
static gboolean
modem_init_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
}
static void
modem_init_sequence_ready (MMBaseModem *self,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
GError *error = NULL;
mm_base_modem_at_sequence_full_finish (MM_BASE_MODEM (self), res, NULL, &error);
if (error)
g_simple_async_result_take_error (simple, error);
else {
MMAtSerialPort *secondary;
/* Disable echo in secondary port as well, if any */
secondary = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self));
if (secondary)
/* No need to wait for the reply */
mm_base_modem_at_command_full (MM_BASE_MODEM (self),
secondary,
"E0",
3,
FALSE,
FALSE, /* raw */
NULL, /* cancellable */
NULL,
NULL);
g_simple_async_result_set_op_res_gboolean (simple, TRUE);
}
g_simple_async_result_complete (simple);
g_object_unref (simple);
}
static const MMBaseModemAtCommand modem_init_sequence[] = {
/* Init command. ITU rec v.250 (6.1.1) says:
* The DTE should not include additional commands on the same command line
* after the Z command because such commands may be ignored.
* So run ATZ alone.
*/
{ "Z", 6, FALSE, mm_base_modem_response_processor_no_result_continue },
/* Ensure echo is off after the init command */
{ "E0 V1", 3, FALSE, NULL },
/* Some phones (like Blackberries) don't support +CMEE=1, so make it
* optional. It completely violates 3GPP TS 27.007 (9.1) but what can we do...
*/
{ "+CMEE=1", 3, FALSE, NULL },
/* Additional OPTIONAL initialization */
{ "X4 &C1", 3, FALSE, NULL },
{ NULL }
};
static void
modem_init (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
MMAtSerialPort *primary;
GSimpleAsyncResult *result;
guint init_sequence_index;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
modem_init);
primary = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
if (!primary) {
g_simple_async_result_set_error (
result,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Need primary AT port to run modem init sequence");
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
return;
}
/* Skip ATZ if the device was hotplugged. */
init_sequence_index = mm_base_modem_get_hotplugged (MM_BASE_MODEM (self)) ? 1 : 0;
mm_base_modem_at_sequence_full (MM_BASE_MODEM (self),
primary,
&modem_init_sequence[init_sequence_index],
NULL, /* response_processor_context */
NULL, /* response_processor_context_free */
NULL, /* cancellable */
(GAsyncReadyCallback)modem_init_sequence_ready,
result);
}
/*****************************************************************************/
/* Create Bearer (Modem interface) */
@@ -637,6 +743,8 @@ mm_broadband_modem_novatel_lte_init (MMBroadbandModemNovatelLte *self)
static void
iface_modem_init (MMIfaceModem *iface)
{
iface->modem_init = modem_init;
iface->modem_init_finish = modem_init_finish;
iface->create_bearer = modem_create_bearer;
iface->create_bearer_finish = modem_create_bearer_finish;
iface->create_sim = modem_create_sim;