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

Lots of random fixes:

Browse Source 
Rework the MMCallbackInfo callback invocation.
Always use g_error_literal() where it makes sense.
Replace sleep() calls, with timeouts to not block the whole MM.
This commit is contained in:
Tambet Ingo
2008-12-09 15:41:51 +02:00
parent a504fb408a
commit d1d94de6a1
12 changed files with 199 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/mm-modem-hso.c
+6 -15
View File
@@ -223,19 +223,14 @@ free_dns_array (gpointer data)
}
static void
ip4_callback_wrapper (MMModem *modem,
GError *error,
gpointer user_data)
ip4_config_invoke (MMCallbackInfo *info)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
MMModemHsoIp4Fn callback;
MMModemHsoIp4Fn callback = (MMModemHsoIp4Fn) info->callback;
callback = mm_callback_info_get_data (info, "callback");
callback (MM_MODEM_HSO (modem),
callback (MM_MODEM_HSO (info->modem),
GPOINTER_TO_UINT (mm_callback_info_get_data (info, "ip4-address")),
mm_callback_info_get_data (info, "ip4-dns"),
error,
mm_callback_info_get_data (info, "user-data"));
(GArray *) mm_callback_info_get_data (info, "ip4-dns"),
info->error, info->user_data);
}
static void
@@ -305,11 +300,7 @@ mm_hso_modem_get_ip4_config (MMModemHso *self,
g_return_if_fail (MM_IS_MODEM_HSO (self));
g_return_if_fail (callback != NULL);
info = mm_callback_info_new (MM_MODEM (self), ip4_callback_wrapper, NULL);
info->user_data = info;
mm_callback_info_set_data (info, "callback", callback, NULL);
mm_callback_info_set_data (info, "user-data", user_data, NULL);
info = mm_callback_info_new_full (MM_MODEM (self), ip4_config_invoke, G_CALLBACK (callback), user_data);
command = g_strdup_printf ("AT_OWANDATA=%d", hso_get_cid (self));
mm_serial_queue_command (MM_SERIAL (self), command, 3, get_ip4_config_done, info);
g_free (command);
plugins/mm-modem-huawei.c
+11 -14
View File
@@ -41,14 +41,14 @@ static void
parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
MMModemFn cb = (MMModemFn) mm_callback_info_get_data (info, "callback");
if (!error) {
if (error)
info->error = g_error_copy (error);
else
/* Enable unsolicited registration state changes */
mm_serial_queue_command (MM_SERIAL (modem), "+CREG=1", 5, NULL, NULL);
}
cb (modem, error, mm_callback_info_get_data (info, "user-data"));
mm_callback_info_schedule (info);
}
static void
@@ -64,10 +64,7 @@ enable (MMModem *modem,
if (enable) {
MMCallbackInfo *info;
info = mm_callback_info_new (modem, parent_enable_done, NULL);
info->user_data = info;
mm_callback_info_set_data (info, "callback", callback, NULL);
mm_callback_info_set_data (info, "user-data", user_data, NULL);
info = mm_callback_info_new (modem, callback, user_data);
parent_modem_iface->enable (modem, enable, parent_enable_done, info);
} else
parent_modem_iface->enable (modem, enable, callback, user_data);
@@ -161,7 +158,7 @@ set_network_mode (MMModemGsmNetwork *modem,
mm_callback_info_set_data (info, "mode-b", GINT_TO_POINTER (2), NULL);
break;
default:
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "%s", "Invalid mode.");
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "Invalid mode.");
mm_callback_info_schedule (info);
return;
break;
@@ -197,8 +194,8 @@ get_network_mode_done (MMSerial *serial,
}
if (result == 0)
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"%s", "Could not parse network mode results");
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"Could not parse network mode results");
else
mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL);
}
@@ -280,7 +277,7 @@ set_band (MMModemGsmNetwork *modem,
mm_callback_info_set_data (info, "band", GUINT_TO_POINTER (0x200000), NULL);
break;
default:
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "%s", "Invalid band.");
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "Invalid band.");
mm_callback_info_schedule (info);
return;
break;
@@ -314,8 +311,8 @@ get_band_done (MMSerial *serial,
}
if (result == 0xdeadbeaf)
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"%s", "Could not parse band results");
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"Could not parse band results");
else
mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL);
}
plugins/mm-modem-mbm.c
+2 -2
View File
@@ -308,8 +308,8 @@ get_network_mode_done (MMSerial *serial,
}
if (result == 0)
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"%s", "Could not parse network mode results");
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"Could not parse network mode results");
else
mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL);
}
plugins/mm-modem-option.c
+15 -7
View File
@@ -33,6 +33,18 @@ pin_check_done (MMModem *modem, GError *error, gpointer user_data)
mm_callback_info_schedule (info);
}
static gboolean
option_enabled (gpointer data)
{
MMCallbackInfo *info = (MMCallbackInfo *) data;
/* Now check the PIN explicitly, option doesn't seem to report
that it needs it otherwise */
mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
return FALSE;
}
static void
parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
{
@@ -43,11 +55,7 @@ parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "option-enable"))) {
/* Option returns OK on +CFUN=1 right away but needs some time
to finish initialization */
sleep (10);
/* Now check the PIN explicitly, option doesn't seem to report
that it needs it otherwise */
mm_generic_gsm_check_pin (MM_GENERIC_GSM (modem), pin_check_done, info);
g_timeout_add_seconds (10, option_enabled, info);
return;
}
@@ -110,8 +118,8 @@ get_network_mode_done (MMSerial *serial,
}
if (!error && !parsed)
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"%s", "Could not parse network mode results");
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"Could not parse network mode results");
mm_callback_info_schedule (info);
}
plugins/mm-modem-sierra.c
+24 -1
View File
@@ -23,6 +23,28 @@ mm_modem_sierra_new (const char *data_device,
NULL));
}
static void
pin_check_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
if (error)
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
}
static gboolean
sierra_enabled (gpointer data)
{
MMCallbackInfo *info = (MMCallbackInfo *) data;
/* Now check the PIN explicitly, sierra doesn't seem to report
that it needs it otherwise */
mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
return FALSE;
}
static void
parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
{
@@ -33,7 +55,8 @@ parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "sierra-enable"))) {
/* Sierra returns OK on +CFUN=1 right away but needs some time
to finish initialization */
sleep (10);
g_timeout_add_seconds (10, sierra_enabled, info);
return;
}
mm_callback_info_schedule (info);