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

cdma: try +CSQ? if CSQ fails

Browse Source 
Some modems want one, some modems want the other.  Try both.
This commit is contained in:
Dan Williams
2009-12-11 10:48:23 -08:00
parent 3d852435c6
commit 41ea9a0e4b
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -730,6 +730,8 @@ mm_generic_cdma_update_evdo_quality (MMGenericCdma *self, guint32 quality)
} }
} }
#define CSQ2_TRIED "csq?-tried"
static void static void
get_signal_quality_done (MMSerialPort *port, get_signal_quality_done (MMSerialPort *port,
GString *response, GString *response,
@@ -740,9 +742,19 @@ get_signal_quality_done (MMSerialPort *port,
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMCallbackInfo *info = (MMCallbackInfo *) user_data;
char *reply = response->str; char *reply = response->str;
if (error) if (error) {
info->error = g_error_copy (error); if (mm_callback_info_get_data (info, CSQ2_TRIED))
else if (!strncmp (reply, "+CSQ: ", 6)) { info->error = g_error_copy (error);
else {
/* Some modems want +CSQ, others want +CSQ?, and some of both types
* will return ERROR if they don't get the command they want. So
* try the other command if the first one fails.
*/
mm_callback_info_set_data (info, CSQ2_TRIED, GUINT_TO_POINTER (1), NULL);
mm_serial_port_queue_command (port, "+CSQ?", 3, get_signal_quality_done, info);
return;
}
} else if (!strncmp (reply, "+CSQ: ", 6)) {
/* Got valid reply */ /* Got valid reply */
int quality, ber; int quality, ber;