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

Revert "broadband-modem: skip indicators and unsolicited events setup in CDMA-only modems"

Browse Source 
This reverts commit b16f9bbba6aeb8b54a81192dca76d57ac0e88aae.
This commit is contained in:
Aleksander Morgado
2012-03-15 14:14:43 +01:00
parent 611970a424
commit 5c3154bbba
1 changed files with 8 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem.c
+8 -41
View File
@@ -1047,15 +1047,6 @@ setup_indicators (MMIfaceModem *self,
user_data,
setup_indicators);
/* CDMA-only modems don't need this */
if (mm_iface_modem_is_cdma_only (self)) {
mm_dbg ("Skipping indicators setup in CDMA-only modem...");
g_simple_async_result_set_op_res_gboolean (result, TRUE);
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
return;
}
/* Load supported indicators */
mm_base_modem_at_command (MM_BASE_MODEM (self),
"+CIND=?",
@@ -1211,28 +1202,16 @@ enable_unsolicited_events (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
GSimpleAsyncResult *result;
UnsolicitedEventsContext *ctx;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
enable_unsolicited_events);
/* CDMA-only modems don't need this */
if (mm_iface_modem_is_cdma_only (self)) {
mm_dbg ("Skipping unsolicited events enabling in CDMA-only modem...");
g_simple_async_result_set_op_res_gboolean (result, TRUE);
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
return;
}
ctx = g_new0 (UnsolicitedEventsContext, 1);
ctx->self = g_object_ref (self);
ctx->enable = TRUE;
ctx->command = g_strdup ("+CMER=3,0,0,1");
ctx->result = result;
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
enable_unsolicited_events);
unsolicited_events (ctx);
}
@@ -1242,27 +1221,15 @@ disable_unsolicited_events (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
GSimpleAsyncResult *result;
UnsolicitedEventsContext *ctx;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
disable_unsolicited_events);
/* CDMA-only modems don't need this */
if (mm_iface_modem_is_cdma_only (self)) {
mm_dbg ("Skipping unsolicited events disabling in CDMA-only modem...");
g_simple_async_result_set_op_res_gboolean (result, TRUE);
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
return;
}
ctx = g_new0 (UnsolicitedEventsContext, 1);
ctx->self = g_object_ref (self);
ctx->command = g_strdup ("+CMER=0");
ctx->result = result;
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
disable_unsolicited_events);
unsolicited_events (ctx);
}