From ddad4d80676f27788a3cac9ecb24021706d9b7ed Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Mon, 7 Dec 2009 12:27:36 -0600 Subject: [PATCH] Refactor: Calypso unsolicited signal strength --- drivers/atmodem/network-registration.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c index 915944e2..df3ce0d9 100644 --- a/drivers/atmodem/network-registration.c +++ b/drivers/atmodem/network-registration.c @@ -631,10 +631,18 @@ static void at_network_registration_initialized(gboolean ok, GAtResult *result, g_at_chat_register(nd->chat, "+CSQ:", csq_notify, FALSE, netreg, NULL); - if (nd->vendor == OFONO_VENDOR_CALYPSO) + switch (nd->vendor) { + case OFONO_VENDOR_CALYPSO: + g_at_chat_send(nd->chat, "AT%CSQ=1", none_prefix, + NULL, NULL, NULL); g_at_chat_register(nd->chat, "%CSQ:", calypso_csq_notify, FALSE, netreg, NULL); + break; + default: + break; + } + ofono_netreg_register(netreg); } @@ -700,9 +708,6 @@ static int at_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor, nd->vendor = vendor; ofono_netreg_set_data(netreg, nd); - if (nd->vendor == OFONO_VENDOR_CALYPSO) - g_at_chat_send(chat, "AT%CSQ=1", NULL, NULL, NULL, NULL); - g_at_chat_send(chat, "AT+CREG=?", creg_prefix, at_creg_test_cb, netreg, NULL);