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

cdma: handle older AT+CSS response format

Browse Source
This commit is contained in:
Dan Williams
2009-08-31 14:30:23 -05:00
parent a479b58f50
commit 63dcc3e189
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -518,6 +518,7 @@ serving_system_done (MMSerialPort *port,
char *reply = response->str; char *reply = response->str;
int class = 0, sid = 99999, num; int class = 0, sid = 99999, num;
unsigned char band = 'Z'; unsigned char band = 'Z';
gboolean success = FALSE;
if (error) { if (error) {
info->error = g_error_copy (error); info->error = g_error_copy (error);
@@ -527,27 +528,40 @@ serving_system_done (MMSerialPort *port,
if (strstr (reply, "+CSS: ")) if (strstr (reply, "+CSS: "))
reply += 6; reply += 6;
num = sscanf (reply, "%d , %c , %d", &class, &band, &sid); num = sscanf (reply, "? , %d", &sid);
if (num == 3) { if (num == 1) {
/* Normalize */ /* UTStarcom modem that uses IS-707-A format */
class = CLAMP (class, 0, 4); success = TRUE;
band = CLAMP (band, 'A', 'Z'); } else {
num = sscanf (reply, "%d , %c , %d", &class, &band, &sid);
if (num == 3) {
/* Modem uses IS-707-A-2 format */
/* Normalize */
class = CLAMP (class, 0, 4);
band = CLAMP (band, 'A', 'Z');
success = TRUE;
}
}
if (success) {
/* 99999 means unknown/no service */
if (sid < 0 || sid > 32767) if (sid < 0 || sid > 32767)
sid = 99999; sid = 99999;
/* 99 means unknown/no service */ if (sid == 0 || sid == 99999) {
if (sid == 99999) {
info->error = g_error_new_literal (MM_MOBILE_ERROR, info->error = g_error_new_literal (MM_MOBILE_ERROR,
MM_MOBILE_ERROR_NO_NETWORK, MM_MOBILE_ERROR_NO_NETWORK,
"No service"); "No service");
} else { } else {
mm_callback_info_set_data (info, "class", GUINT_TO_POINTER (class), NULL); mm_callback_info_set_data (info, "class", GUINT_TO_POINTER (class), NULL);
mm_callback_info_set_data (info, "band", GUINT_TO_POINTER ((guint32) band), NULL); mm_callback_info_set_data (info, "band", GUINT_TO_POINTER ((guint32) band), NULL);
mm_callback_info_set_data (info, "sid", GUINT_TO_POINTER (sid), NULL); mm_callback_info_set_data (info, "sid", GUINT_TO_POINTER (sid), NULL);
} }
} else } else {
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"Could not parse Serving System results."); "Could not parse Serving System results.");
}
out: out:
mm_callback_info_schedule (info); mm_callback_info_schedule (info);