From fce498bdef8f6179ef477ecdd3b9407e673af640 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Thu, 30 Jan 2020 18:21:15 +0100 Subject: modem boot handlers: pass it the ipc_client struct This enables to use logging inside the handlers: ipc_client_log needs access to the ipc_client struct to work. At this point the ipc_client struct is already available, so it is safe to do that. Signed-off-by: Denis 'GNUtoo' Carikli --- samsung-ipc/devices/n5100/n5100.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'samsung-ipc/devices/n5100/n5100.c') diff --git a/samsung-ipc/devices/n5100/n5100.c b/samsung-ipc/devices/n5100/n5100.c index bff8cf4..04a0585 100644 --- a/samsung-ipc/devices/n5100/n5100.c +++ b/samsung-ipc/devices/n5100/n5100.c @@ -76,15 +76,15 @@ int n5100_boot(struct ipc_client *client) } ipc_client_log(client, "Opened modem link device"); - rc = xmm626_sec_modem_hci_power(0); + rc = xmm626_sec_modem_hci_power(client, 0); if (rc < 0) { ipc_client_log(client, "Turning the modem off failed"); goto error; } ipc_client_log(client, "Turned the modem off"); - rc = xmm626_sec_modem_power(modem_boot_fd, 1); - rc |= xmm626_sec_modem_hci_power(1); + rc = xmm626_sec_modem_power(client, modem_boot_fd, 1); + rc |= xmm626_sec_modem_hci_power(client, 1); if (rc < 0) { ipc_client_log(client, "Turning the modem on failed"); @@ -92,7 +92,7 @@ int n5100_boot(struct ipc_client *client) } ipc_client_log(client, "Turned the modem on"); - rc = xmm626_sec_modem_link_connected_wait(modem_link_fd); + rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd); if (rc < 0) { ipc_client_log(client, "Waiting for link connected failed"); goto error; @@ -169,37 +169,37 @@ int n5100_boot(struct ipc_client *client) usleep(300000); - rc = xmm626_sec_modem_link_get_hostwake_wait(modem_link_fd); + rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd); if (rc < 0) { ipc_client_log(client, "Waiting for host wake failed"); } - rc = xmm626_sec_modem_link_control_enable(modem_link_fd, 0); - rc |= xmm626_sec_modem_hci_power(0); - rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 0); + rc = xmm626_sec_modem_link_control_enable(client, modem_link_fd, 0); + rc |= xmm626_sec_modem_hci_power(client, 0); + rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 0); if (rc < 0) { ipc_client_log(client, "Turning the modem off failed"); goto error; } - rc = xmm626_sec_modem_link_get_hostwake_wait(modem_link_fd); + rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd); if (rc < 0) { ipc_client_log(client, "Waiting for host wake failed"); goto error; } ipc_client_log(client, "Waited for host wake"); - rc = xmm626_sec_modem_link_control_enable(modem_link_fd, 1); - rc |= xmm626_sec_modem_hci_power(1); - rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 1); + rc = xmm626_sec_modem_link_control_enable(client, modem_link_fd, 1); + rc |= xmm626_sec_modem_hci_power(client, 1); + rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 1); if (rc < 0) { ipc_client_log(client, "Turning the modem on failed"); goto error; } - rc = xmm626_sec_modem_link_connected_wait(modem_link_fd); + rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd); if (rc < 0) { ipc_client_log(client, "Waiting for link connected failed"); goto error; @@ -322,7 +322,7 @@ int n5100_power_off(__attribute__((unused)) struct ipc_client *client, if (fd < 0) return -1; - rc = xmm626_sec_modem_power(fd, 0); + rc = xmm626_sec_modem_power(client, fd, 0); close(fd); -- cgit v1.2.3