dany/eg25-manager
1
0
Fork 0
mirror of https://gitlab.com/mobian1/eg25-manager.git synced 2025-08-29 23:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "manager: split modem_suspend() into _pre() and _post() functions"

Browse Source 
This reverts commit ff9b26b831.
This commit is contained in:
Arnaud Ferraris
2020-12-11 13:36:28 +01:00
parent 9713af7ca8
commit 75b0920e9d
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/manager.c
View File

@@ -135,20 +135,14 @@ error:
manager->modem_state = EG25_STATE_RESETTING; manager->modem_state = EG25_STATE_RESETTING;
} }
void modem_suspend_pre(struct EG25Manager *manager) void modem_suspend(struct EG25Manager *manager)
{ {
manager->modem_state = EG25_STATE_SUSPENDING;
gpio_sequence_suspend(manager); gpio_sequence_suspend(manager);
}
void modem_suspend_post(struct EG25Manager *manager)
{
at_sequence_suspend(manager); at_sequence_suspend(manager);
} }
void modem_resume_pre(struct EG25Manager *manager) void modem_resume_pre(struct EG25Manager *manager)
{ {
manager->modem_state = EG25_STATE_RESUMING;
gpio_sequence_resume(manager); gpio_sequence_resume(manager);
} }

3
src/manager.h
View File

@@ -51,8 +51,7 @@ struct EG25Manager {
void modem_configure(struct EG25Manager *data); void modem_configure(struct EG25Manager *data);
void modem_reset(struct EG25Manager *data); void modem_reset(struct EG25Manager *data);
void modem_suspend_pre(struct EG25Manager *data); void modem_suspend(struct EG25Manager *data);
void modem_suspend_post(struct EG25Manager *data);
void modem_resume_pre(struct EG25Manager *data); void modem_resume_pre(struct EG25Manager *data);
void modem_resume_post(struct EG25Manager *data); void modem_resume_post(struct EG25Manager *data);
void modem_update_state(struct EG25Manager *data, MMModemState state); void modem_update_state(struct EG25Manager *data, MMModemState state);

3
src/mm-iface.c
View File

@@ -132,9 +132,6 @@ static void object_removed_cb(struct EG25Manager *manager, GDBusObject *object)
path = g_dbus_object_get_object_path(object); path = g_dbus_object_get_object_path(object);
g_message("ModemManager object `%s' removed", path); g_message("ModemManager object `%s' removed", path);
if (manager->modem_state == EG25_STATE_SUSPENDING)
modem_suspend_post(manager);
manager->mm_modem = NULL; manager->mm_modem = NULL;
if (manager->modem_usb_id) { if (manager->modem_usb_id) {
g_free(manager->modem_usb_id); g_free(manager->modem_usb_id);

4
src/suspend.c
View File

@@ -92,11 +92,13 @@ static void signal_cb(GDBusProxy *proxy,
if (is_about_to_suspend) { if (is_about_to_suspend) {
g_message("system is about to suspend"); g_message("system is about to suspend");
modem_suspend_pre(manager); manager->modem_state = EG25_STATE_SUSPENDING;
modem_suspend(manager);
} else { } else {
g_message("system is resuming"); g_message("system is resuming");
take_inhibitor(manager); take_inhibitor(manager);
modem_resume_pre(manager); modem_resume_pre(manager);
manager->modem_state = EG25_STATE_RESUMING;
manager->suspend_source = g_timeout_add_seconds(8, G_SOURCE_FUNC(check_modem_resume), manager); manager->suspend_source = g_timeout_add_seconds(8, G_SOURCE_FUNC(check_modem_resume), manager);
} }
} }