Code cleanup

This commit is contained in:
Pierre Pronchery 2011-11-03 00:00:34 +00:00
parent e108adcc1f
commit 6661ed874a

View File

@ -157,6 +157,9 @@ static int _openmoko_event(PhonePlugin * plugin, PhoneEvent * event)
case PHONE_EVENT_TYPE_STARTED: case PHONE_EVENT_TYPE_STARTED:
_openmoko_power(plugin, TRUE); _openmoko_power(plugin, TRUE);
break; break;
case PHONE_EVENT_TYPE_ONLINE:
_openmoko_deepsleep(plugin);
break;
case PHONE_EVENT_TYPE_STOPPED: case PHONE_EVENT_TYPE_STOPPED:
_openmoko_power(plugin, FALSE); _openmoko_power(plugin, FALSE);
break; break;
@ -258,10 +261,6 @@ static int _event_modem_event(PhonePlugin * plugin, ModemEvent * event)
/* enable echo cancellation */ /* enable echo cancellation */
_openmoko_queue(plugin, "AT%N0187"); _openmoko_queue(plugin, "AT%N0187");
break; break;
case MODEM_EVENT_TYPE_STATUS:
if(event->status.status == MODEM_STATUS_ONLINE)
_openmoko_deepsleep(plugin);
break;
default: default:
break; break;
} }
@ -342,9 +341,10 @@ static void _openmoko_deepsleep(PhonePlugin * plugin)
if((p = helper->config_get(helper->phone, "openmoko", "deepsleep")) if((p = helper->config_get(helper->phone, "openmoko", "deepsleep"))
!= NULL && strtoul(p, NULL, 10) != 0) != NULL && strtoul(p, NULL, 10) != 0)
cmd = "AT%SLEEP=2"; /* prevent deep sleep */ cmd = "AT%SLEEP=2"; /* prevent deep sleep */
/* XXX may reset the hardware modem */
_openmoko_queue(plugin, cmd); _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);
} }