From 6661ed874adc43fcc2ee3593cb2a318e3c25c30d Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 3 Nov 2011 00:00:34 +0000 Subject: [PATCH] Code cleanup --- src/plugins/openmoko.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/openmoko.c b/src/plugins/openmoko.c index 2f8161f..28a9931 100644 --- a/src/plugins/openmoko.c +++ b/src/plugins/openmoko.c @@ -157,6 +157,9 @@ static int _openmoko_event(PhonePlugin * plugin, PhoneEvent * event) case PHONE_EVENT_TYPE_STARTED: _openmoko_power(plugin, TRUE); break; + case PHONE_EVENT_TYPE_ONLINE: + _openmoko_deepsleep(plugin); + break; case PHONE_EVENT_TYPE_STOPPED: _openmoko_power(plugin, FALSE); break; @@ -258,10 +261,6 @@ static int _event_modem_event(PhonePlugin * plugin, ModemEvent * event) /* enable echo cancellation */ _openmoko_queue(plugin, "AT%N0187"); break; - case MODEM_EVENT_TYPE_STATUS: - if(event->status.status == MODEM_STATUS_ONLINE) - _openmoko_deepsleep(plugin); - break; default: break; } @@ -342,9 +341,10 @@ static void _openmoko_deepsleep(PhonePlugin * plugin) if((p = helper->config_get(helper->phone, "openmoko", "deepsleep")) != NULL && strtoul(p, NULL, 10) != 0) cmd = "AT%SLEEP=2"; /* prevent deep sleep */ - /* XXX may reset the hardware modem */ _openmoko_queue(plugin, cmd); - _openmoko_queue(plugin, "AT+CPIN?"); + /* check if the hardware modem was reset */ + plugin->helper->trigger(plugin->helper->phone, + MODEM_EVENT_TYPE_AUTHENTICATION); }