Merge pull request #638 from bkokoszx/logger-rimage-headers

logger: include file_format.h directly from rimage
This commit is contained in:
Liam Girdwood 2018-11-27 14:33:57 +00:00 committed by GitHub
commit 983517e359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 15 deletions

View File

@ -6,5 +6,6 @@ sof_logger_SOURCES = \
sof_logger_CFLAGS = \ sof_logger_CFLAGS = \
-I ../../src/include \ -I ../../src/include \
-I ../../ \
-Wall \ -Wall \
-Werror -Werror

View File

@ -29,21 +29,6 @@
#define TRACE_MAX_IDS_STR 10 #define TRACE_MAX_IDS_STR 10
#define TRACE_IDS_MASK ((1 << TRACE_ID_LENGTH) - 1) #define TRACE_IDS_MASK ((1 << TRACE_ID_LENGTH) - 1)
/* logs file signature */
#define SND_SOF_LOGS_SIG_SIZE 4
#define SND_SOF_LOGS_SIG "Logs"
/*
* Logs dictionary file header.
*/
struct snd_sof_logs_header {
unsigned char sig[SND_SOF_LOGS_SIG_SIZE]; /* "Logs" */
uint32_t base_address; /* address of log entries section */
uint32_t data_length; /* amount of bytes following this header */
uint32_t data_offset; /* offset to first entry in this file */
struct sof_ipc_fw_version version;
};
struct ldc_entry_header { struct ldc_entry_header {
uint32_t level; uint32_t level;
uint32_t component_class; uint32_t component_class;

View File

@ -15,6 +15,7 @@
#include <stdio.h> #include <stdio.h>
#include <uapi/user/trace.h> #include <uapi/user/trace.h>
#include <uapi/ipc/info.h> #include <uapi/ipc/info.h>
#include <rimage/file_format.h>
#define KNRM "\x1B[0m" #define KNRM "\x1B[0m"
#define KRED "\x1B[31m" #define KRED "\x1B[31m"