diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-02-24 18:21:04 +0100 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-03-01 16:37:37 +0100 |
commit | 3c098202c4e255cccd0b69c76cae65bf46d8a0f9 (patch) | |
tree | b0ce05b5fca6dac90654edd99db54377cd5f4333 | |
parent | d1e5dcbe3736e3ec6ccba6decd7628eae6cc9699 (diff) | |
download | hardware_replicant_libsamsung-ipc-3c098202c4e255cccd0b69c76cae65bf46d8a0f9.tar.gz hardware_replicant_libsamsung-ipc-3c098202c4e255cccd0b69c76cae65bf46d8a0f9.tar.bz2 hardware_replicant_libsamsung-ipc-3c098202c4e255cccd0b69c76cae65bf46d8a0f9.zip |
last fixes
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r-- | samsung-ipc/devices/generic/generic.c | 5 | ||||
-rw-r--r-- | tools/common/modem.c | 19 | ||||
-rw-r--r-- | tools/ipc-imei.c | 10 |
3 files changed, 21 insertions, 13 deletions
diff --git a/samsung-ipc/devices/generic/generic.c b/samsung-ipc/devices/generic/generic.c index 1c78780..4f6b01b 100644 --- a/samsung-ipc/devices/generic/generic.c +++ b/samsung-ipc/devices/generic/generic.c @@ -533,6 +533,8 @@ int generic_poll(__attribute__((unused)) struct ipc_client *client, int rc; struct pollfd fd; + ipc_client_log(client, "ENTER %s", __func__); + if (data == NULL) return -1; @@ -541,8 +543,11 @@ int generic_poll(__attribute__((unused)) struct ipc_client *client, fd.fd = transport_data->fd; fd.events = POLLRDNORM | POLLIN; + ipc_client_log(client, "%s: transport_data->fd: %d", __func__, transport_data->fd); rc = poll(&fd, 1, -1); + ipc_client_log(client, "%s: poll: %d", __func__, rc); + return rc - 1; } diff --git a/tools/common/modem.c b/tools/common/modem.c index 4cf904c..9644ecb 100644 --- a/tools/common/modem.c +++ b/tools/common/modem.c @@ -300,18 +300,27 @@ int modem_read_loop(struct ipc_client *client, struct ipc_message resp; int rc; - if (!client) + common_modem_log(client, "ENTER %s", __func__); + + if (!client) { + common_modem_log(client, "%s: ipc_client is NULL", __func__); return 0; + } memset(&resp, 0, sizeof(resp)); while (1) { usleep(3000); + common_modem_log(client, "%s: Starting ipc_client_poll", __func__); rc = ipc_client_poll(client, NULL, NULL); + + common_modem_log(client, "%s: ipc_client_poll: %d", __func__, rc); if (rc < 0) continue; + common_modem_log(client, "%s: ipc_client_poll done", __func__); + rc = ipc_client_recv(client, &resp); if (rc < 0) { if (resp.data != NULL) @@ -424,14 +433,6 @@ int modem_start(struct ipc_client *client, enum modem_state new_state, } common_modem_log(client, "%s: modem_start done", __func__); - common_modem_log(client, "%s: Starting modem_read_loop", __func__); - - rc = modem_read_loop(client, new_state, handler); - if (rc < 0) - common_modem_log(client, - "modem_read_loop failed: error %d\n", rc); - - common_modem_log(client, "%s: modem_read_loop done. rc=%d", __func__, rc); return 0; } diff --git a/tools/ipc-imei.c b/tools/ipc-imei.c index e45598d..76fcead 100644 --- a/tools/ipc-imei.c +++ b/tools/ipc-imei.c @@ -44,10 +44,12 @@ void modem_log_handler(void *user_data, const char *msg) else if (message[i] != 0) break; } - //if (user_data == NULL) - // printf("[ ipc ] %s\n", message); - if (user_data != NULL) + if (user_data == NULL) { + printf("[ ipc ] %s\n", message); + } + if (user_data != NULL) { printf("[ %s ] %s\n", user_data, message); + } } free(message); @@ -204,7 +206,7 @@ int main(int argc, char** argv) ipc_imei_request_imei(client); - ipc_imei_log(client, "ipc_imei_request_imei done\n"); + //ipc_imei_log(client, "ipc_imei_request_imei done\n"); /* TODO: MODEM_STATE_LPM is not needed here */ rc = modem_read_loop(client, MODEM_STATE_LPM, &handler); |