Fix device API handling poweroff

The device internal API enum and function have been updated.

Change-Id: Ie69f37eeefb5ee4fbf592e56886c3a6690f36d26
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/src/manager_modem.c b/src/manager_modem.c
index 29edd52..97f8b44 100644 (file)
--- a/src/manager_modem.c
+++ b/src/manager_modem.c
@@ -245,7 +245,8 @@ static void __request_modem_poweroff(TcorePlugin *modem_plugin)
        dbg("done");
 }
 
-static void manager_modem_poweroff_handler(const struct device_change_state_info *info, void *user_data)
+static void manager_modem_poweroff_handler(device_power_state_e prev_state, device_power_state_e next_state,
+                                                            uint64_t wait_callback_id, device_power_transition_reason_e reason, void *user_data)
 {
        ModemPrivateInfo *modem_info = user_data;
        TcorePlugin *modem_plugin = NULL;
@@ -254,7 +255,7 @@ static void manager_modem_poweroff_handler(const struct device_change_state_info
        if (G_UNLIKELY(!modem_info))
                return;
 
-       modem_info->poweroff_id = info->id;
+       modem_info->poweroff_id = wait_callback_id;
 
        modem_plugin = tcore_object_ref_plugin(modem_info->co_modem);
        dbg("poweroff state changed is happened");
@@ -293,7 +294,7 @@ static void mamager_modem_register_poweroff_handler(ModemPrivateInfo *modem_info
        if (profile)
                free(profile);
 
-       device_power_add_change_state_wait_callback(POWER_STATE_POWEROFF | POWER_STATE_REBOOT, manager_modem_poweroff_handler, modem_info);
+       device_power_add_state_wait_callback(DEVICE_POWER_STATE_POWEROFF | DEVICE_POWER_STATE_REBOOT, manager_modem_poweroff_handler, modem_info);
 
        dbg("done");
 }
@@ -337,8 +338,8 @@ void manager_modem_clear_private_info(ModemBoard *mb)
        }
 
        if (mb->index == MANAGER_MODEM_BOARD_INDEX_0) {
-               dbg("device_power_remove_change_state_wait_callback() for modem index (%d)", mb->index);
-               device_power_remove_change_state_wait_callback(POWER_STATE_POWEROFF | POWER_STATE_REBOOT);
+               dbg("device_power_remove_state_wait_callback() for modem index (%d)", mb->index);
+               device_power_remove_state_wait_callback(DEVICE_POWER_STATE_POWEROFF | DEVICE_POWER_STATE_REBOOT);
        }
 
        g_free(mb->modem_info);
@@ -397,7 +398,7 @@ enum tcore_manager_return manager_modem_process_notification(Manager *manager,
                                dbg("Should removed poweroff timer in case of modem index (0)");
 
                                if (mb->modem_info->poweroff_id > 0) {
-                                       device_power_change_state_wait_done(mb->modem_info->poweroff_id);
+                                       device_power_confirm_wait_callback(mb->modem_info->poweroff_id);
                                        mb->modem_info->poweroff_id = 0;
                                }
                        }