From: Yan Wang yan.wang@linux.intel.com

1. Move source and header file. 2. Change src/lib/Makefile.am and src/audio/Makefile.am. 3. Chnage header file path.

Signed-off-by: Yan Wang yan.wang@linux.intel.com --- src/audio/Makefile.am | 1 - src/include/reef/{audio => }/dma-trace.h | 0 src/include/reef/ipc.h | 2 +- src/lib/Makefile.am | 1 + src/{audio => lib}/dma-trace.c | 3 +-- src/lib/trace.c | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) rename src/include/reef/{audio => }/dma-trace.h (100%) rename src/{audio => lib}/dma-trace.c (98%)

diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 7ffe01f..285422e 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -17,7 +17,6 @@ libaudio_a_SOURCES = \ pipeline.c \ pipeline_static.c \ component.c \ - dma-trace.c \ buffer.c

libaudio_a_CFLAGS = \ diff --git a/src/include/reef/audio/dma-trace.h b/src/include/reef/dma-trace.h similarity index 100% rename from src/include/reef/audio/dma-trace.h rename to src/include/reef/dma-trace.h diff --git a/src/include/reef/ipc.h b/src/include/reef/ipc.h index a552626..472aca8 100644 --- a/src/include/reef/ipc.h +++ b/src/include/reef/ipc.h @@ -40,7 +40,7 @@ #include <uapi/ipc.h> #include <reef/audio/pipeline.h> #include <reef/audio/component.h> -#include <reef/audio/dma-trace.h> +#include <reef/dma-trace.h>

struct reef; struct dai_config; diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index acdbd85..b4521df 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -6,6 +6,7 @@ libcore_a_SOURCES = \ work.c \ notifier.c \ trace.c \ + dma-trace.c \ schedule.c

libcore_a_CFLAGS = \ diff --git a/src/audio/dma-trace.c b/src/lib/dma-trace.c similarity index 98% rename from src/audio/dma-trace.c rename to src/lib/dma-trace.c index b0267fa..5885037 100644 --- a/src/audio/dma-trace.c +++ b/src/lib/dma-trace.c @@ -29,7 +29,7 @@ */

#include <reef/trace.h> -#include <reef/audio/dma-trace.h> +#include <reef/dma-trace.h> #include <reef/ipc.h> #include <reef/reef.h> #include <reef/alloc.h> @@ -172,7 +172,6 @@ int dma_trace_enable(struct dma_trace_data *d) return -ENODEV; }

- /* TODO: fix crash when enabled */ d->enabled = 1; work_schedule_default(&d->dmat_work, DMA_TRACE_US); return 0; diff --git a/src/lib/trace.c b/src/lib/trace.c index c0abf7c..eec93b5 100644 --- a/src/lib/trace.c +++ b/src/lib/trace.c @@ -34,7 +34,7 @@ #include <arch/cache.h> #include <platform/timer.h> #include <reef/lock.h> -#include <reef/audio/dma-trace.h> +#include <reef/dma-trace.h> #include <stdint.h>

struct trace {