From 354785f440e3b9939606710264c552fb99b3637f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 17 Jul 2009 23:03:16 -0400 Subject: cdma: handle devices that don't prefix CSS result with +CSS: Like the Sanyo SCP-3800 (Sprint Katana LX). Make up your freakin' mind people, either prefix *all* responses with the command stem, or don't. But just pick one dammit. --- src/mm-generic-cdma.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c index 22286ebe..64ea761a 100644 --- a/src/mm-generic-cdma.c +++ b/src/mm-generic-cdma.c @@ -510,14 +510,8 @@ serving_system_done (MMSerialPort *port, goto out; } - if (!strstr (reply, "+CSS: ")) { - info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, - "Could not parse Serving System results."); - goto out; - } - - /* Got valid reply */ - reply += 6; + if (strstr (reply, "+CSS: ")) + reply += 6; num = sscanf (reply, "%d, %c, %d", &class, &band, &sid); if (num != 3) @@ -541,8 +535,8 @@ serving_system_done (MMSerialPort *port, mm_callback_info_set_data (info, "sid", GUINT_TO_POINTER (sid), NULL); } } else - info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, - "%s", "Could not parse signal quality results"); + info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, + "Could not parse Serving System results."); out: mm_callback_info_schedule (info); -- cgit v1.2.3-70-g09d2