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

cdma: consolidate some code by ignoring +CMEE result

Browse Source 
Most modems don't support it and we're ignoring the error message
anyway, so don't bother with a callback for its result.
This commit is contained in:
Dan Williams
2010-09-01 17:31:49 -05:00
parent 67d936e46c
commit 85ce544675
1 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/mm-generic-cdma.c
View File

@@ -560,25 +560,6 @@ out:
mm_callback_info_schedule (info);
}
static void
enable_error_reporting_done (MMAtSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
MMGenericCdma *self = MM_GENERIC_CDMA (info->modem);
/* Just ignore errors, see comment in init_done() */
if (error)
g_warning ("Your CDMA modem does not support +CMEE command");
if (MM_GENERIC_CDMA_GET_CLASS (self)->post_enable)
MM_GENERIC_CDMA_GET_CLASS (self)->post_enable (self, enable_all_done, info);
else
enable_all_done (MM_MODEM (self), NULL, info);
}
static void
init_done (MMAtSerialPort *port,
GString *response,
@@ -595,12 +576,17 @@ init_done (MMAtSerialPort *port,
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
} else {
/* Try to enable better error reporting. My experience so far indicates
there's some CDMA modems that does not support that.
FIXME: It's mandatory by spec, so it really shouldn't be optional. Figure
out which CDMA modems have problems with it and implement plugin for them.
*/
mm_at_serial_port_queue_command (port, "+CMEE=1", 3, enable_error_reporting_done, user_data);
MMGenericCdma *self = MM_GENERIC_CDMA (info->modem);
/* Try enabling better error reporting on CDMA devices, but few
* actually support +CMEE as it's more of a GSM command.
*/
mm_at_serial_port_queue_command (port, "+CMEE=1", 3, NULL, NULL);
if (MM_GENERIC_CDMA_GET_CLASS (self)->post_enable)
MM_GENERIC_CDMA_GET_CLASS (self)->post_enable (self, enable_all_done, info);
else
enable_all_done (MM_MODEM (self), NULL, info);
}
}