Use it

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

1 files changed, 18 insertions, 15 deletions

diff --git a/tools/ipc-imei.c b/tools/ipc-imei.c
index ebd714d..8861ec4 100644
--- a/tools/ipc-imei.c
+++ b/tools/ipc-imei.c
@@ -45,9 +45,9 @@ void modem_log_handler(void *user_data, const char *msg)
 				break;
 		}
 		if (user_data == NULL)
-			printf("[ipc-lib] %s\n", message);
+			printf("[ ipc ] %s\n", message);
 		else
-			printf("[%s] %s\n", user_data, message);
+			printf("[ %s ] %s\n", user_data, message);
 	}
 
 	free(message);
@@ -69,7 +69,7 @@ void ipc_imei_log(struct ipc_client *client, const char *message, ...)
 
         va_start(args, message);
         vsnprintf((char *) &buffer, sizeof(buffer), message, args);
-	modem_log_handler("ipc-sim", buffer); /* No access to ipc_client) */
+	modem_log_handler("ipc-imei", buffer); /* No access to ipc_client) */
         va_end(args);
 }
 
@@ -87,7 +87,7 @@ int ipc_imei_request_imei(struct ipc_client *client)
 	rc = ipc_client_send(client, seq_get(), IPC_MISC_ME_SN, IPC_TYPE_GET,
 			     (void *) &request_data, sizeof(request_data));
 	if (rc < 0)
-		ipc_client_log(client, "ipc_client_send failed with error %d\n",
+		ipc_imei_log(client, "ipc_client_send failed with error %d\n",
 			       rc);
 
 	return rc;
@@ -104,7 +104,7 @@ int ipc_imei_parse_imei_response(struct ipc_client *client,
 		return 0;
 
 	if (message == NULL) {
-		ipc_client_log(client,
+		ipc_imei_log(client,
 			       "%s: ipc_message is null\n", __FUNCTION__);
 		return -EAGAIN;
 	}
@@ -119,7 +119,7 @@ int ipc_imei_parse_imei_response(struct ipc_client *client,
 	if (strlen (imei) > 15 * sizeof(char))
 		imei[15] = '\0';
 
-	ipc_client_log(client, "%s: found IMEI '%s'\n", __FUNCTION__, imei);
+	ipc_imei_log(client, "%s: found IMEI '%s'\n", __FUNCTION__, imei);
 
 	free(imei);
 
@@ -141,7 +141,7 @@ static int ipc_imei_response_handle(struct ipc_client *client,
 		rc = ipc_imei_parse_imei_response(client, resp, data);
 		return rc;
 	default:
-		ipc_client_log(client, "Unhandled %s command",
+		ipc_imei_log(client, "Unhandled %s command",
 			       ipc_group_string(IPC_GROUP(resp->command)));
 		return -EAGAIN;
 	}
@@ -170,10 +170,11 @@ int main(int argc, char** argv)
 
 	rc = ipc_client_log_callback_register(client, modem_log_handler, NULL);
 	if (rc < 0) {
-		printf("ipc_client_log_callback_registerma failed:"
+		printf("ipc_imei_log_callback_registerma failed:"
 		       " error %d\n", rc);
 		return 1;
 	}
+	ipc_imei_log(client, "ipc_client_log_callback_register done");
 
 	/* register new callback that would take over after modem_start is
 	 *  done
@@ -182,37 +183,39 @@ int main(int argc, char** argv)
 						 ipc_imei_response_handle,
 						 NULL);
 	if (rc < 0) {
-		ipc_client_log(client,
+		ipc_imei_log(client,
 			       "register_app_modem_response_handler failed: "
 			       "error %d\n",
 			       rc);
 		return 1;
 	}
 
+	ipc_imei_log(client, "Starting modem");
+
 	rc = modem_start(client, MODEM_STATE_LPM, &handler);
 	if (rc < 0) {
-		ipc_client_log(client, "modem_start failed: error %d\n", rc);
+		ipc_imei_log(client, "modem_start failed: error %d\n", rc);
 		return 1;
 	}
 
-	ipc_client_log(client, "modem_start done\n");
+	ipc_imei_log(client, "modem_start done\n");
 
 	ipc_imei_request_imei(client);
 
-	ipc_client_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);
 	if (rc < 0)
-		ipc_client_log(client,
+		ipc_imei_log(client,
 			       "ipc-imei: modem_read_loop failed: error %d\n",
 			       rc);
 
-	ipc_client_log(client, "ipc-imei: modem_read_loop done");
+	ipc_imei_log(client, "ipc-imei: modem_read_loop done");
 
 	rc = modem_stop(client);
 	if (rc < 0) {
-		ipc_client_log(client, "modem_stop failed: error %d\n", rc);
+		ipc_imei_log(client, "modem_stop failed: error %d\n", rc);
 		return 1;
 	}