Merge pull request #88 from akloniex/unify-logger

logger/rmbox: unify implementation of new logger tool with old rmbox

Author: lgirdwood

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = logger rmbox topology eqctl
+SUBDIRS = rmbox topology eqctl
 TESTDIR = topology/test
 
 tests:

configure.ac

@@ -18,7 +18,6 @@ AC_PROG_CC
 
 AC_OUTPUT([
 	Makefile
-	logger/Makefile
 	rmbox/Makefile
 	eqctl/Makefile
 	topology/Makefile

logger/Makefile.am

@@ -1,4 +1,12 @@
-bin_PROGRAMS = rmbox
+bin_PROGRAMS = rmbox logger
 
 rmbox_SOURCES = \
-	rmbox.c
+	rmbox.c \
+	rmbox_convert.c
+
+logger_SOURCES = \
+	rmbox.c \
+	logger_convert.c
+
+logger_CFLAGS = \
+	-DLOGGER_FORMAT

logger/logger.c

@@ -0,0 +1,41 @@
+/*
+* debug log converter interface.
+*
+* Copyright (c) 2018, Intel Corporation.
+*
+* This program is free software; you can redistribute it and/or modify it
+* under the terms and conditions of the GNU General Public License,
+* version 2, as published by the Free Software Foundation.
+*
+* This program is distributed in the hope it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+* more details.
+*/
+#include <stdio.h>
+#include <sof/uapi/logging.h>
+
+#define KNRM  "\x1B[0m"
+#define KRED  "\x1B[31m"
+
+static double to_usecs(uint64_t time, double clk)
+{
+	/* trace timestamp uses CPU system clock at default 25MHz ticks */
+	// TODO: support variable clock rates
+	return (double)time / clk;
+}
+
+struct convert_config {
+	const char *out_file;
+	const char *in_file;
+	FILE *out_fd;
+	FILE *in_fd;
+	double clock;
+	int trace;
+#ifdef LOGGER_FORMAT
+	const char *ldc_file;
+	FILE* ldc_fd;
+#endif
+};
+
+int convert(struct convert_config *config);