From 9a8ff013abd35a877fb8b97080095f4a2deb88f5 Mon Sep 17 00:00:00 2001
From: Genaro Saucedo Tejada <genaro.saucedo.tejada@intel.com>
Date: Fri, 29 Jul 2016 15:50:39 -0500
Subject: [PATCH] sys_log: replace old debug macros at DMA sample

DMA sample application is now using new system log macros and updated
the .conf file.

JIRA: ZEP-311

Change-Id: I11dbd5c58205297751696e483fc049c1c4b7654c
Signed-off-by: Genaro Saucedo Tejada <genaro.saucedo.tejada@intel.com>
---
 samples/drivers/dma/prj.conf  |  2 ++
 samples/drivers/dma/src/dma.c | 38 ++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/samples/drivers/dma/prj.conf b/samples/drivers/dma/prj.conf
index 00839338baa..f19afd156ca 100644
--- a/samples/drivers/dma/prj.conf
+++ b/samples/drivers/dma/prj.conf
@@ -1,2 +1,4 @@
 CONFIG_DMA=y
 CONFIG_DMA_QMSI=y
+CONFIG_SYS_LOG=y
+CONFIG_SYS_LOG_DMA_LEVEL=4
\ No newline at end of file
diff --git a/samples/drivers/dma/src/dma.c b/samples/drivers/dma/src/dma.c
index ab41e0921d8..e5ea3750db8 100644
--- a/samples/drivers/dma/src/dma.c
+++ b/samples/drivers/dma/src/dma.c
@@ -21,13 +21,8 @@
 #include <device.h>
 #include <dma.h>
 
-#if defined(CONFIG_STDOUT_CONSOLE)
-#include <stdio.h>
-#define DBG	printf
-#else
-#include <misc/printk.h>
-#define DBG	printk
-#endif
+#define SYS_LOG_LEVEL CONFIG_SYS_LOG_DMA_LEVEL
+#include <misc/sys_log.h>
 
 #include <string.h>
 
@@ -66,7 +61,7 @@ static void test_transfer(struct device *dev, void *data)
 
 static void test_error(struct device *dev, void *data)
 {
-	DBG("DMA could not proceed, an error occurred\n");
+	SYS_LOG_ERR("DMA could not proceed, an error occurred");
 }
 
 void main(void)
@@ -78,12 +73,13 @@ void main(void)
 	struct dma_channel_config dma_chan_cfg = {0};
 	struct dma_transfer_config dma_trans = {0};
 
-	DBG("DMA memory to memory transfer started on %s\n", DMA_DEVICE_NAME);
-	DBG("Preparing DMA Controller\n");
+	SYS_LOG_DBG("DMA memory to memory transfer started on %s",
+		    DMA_DEVICE_NAME);
+	SYS_LOG_DBG("Preparing DMA Controller");
 
 	dma = device_get_binding(DMA_DEVICE_NAME);
 	if (!dma) {
-		DBG("Cannot get dma controller\n");
+		SYS_LOG_ERR("Cannot get dma controller");
 		return;
 	}
 
@@ -99,22 +95,22 @@ void main(void)
 	dma_chan_cfg.callback_data = (void *)&chan_id;
 
 	if (dma_channel_config(dma, chan_id, &dma_chan_cfg)) {
-		DBG("Error: configuration\n");
+		SYS_LOG_ERR("configuration");
 		return;
 	}
 
-	DBG("Starting the transfer and waiting for 1 second\n");
+	SYS_LOG_DBG("Starting the transfer and waiting for 1 second");
 	dma_trans.block_size = strlen(tx_data);
 	dma_trans.source_address = (uint32_t *)tx_data;
 	dma_trans.destination_address = (uint32_t *)rx_data[transfer_count];
 
 	if (dma_transfer_config(dma, chan_id, &dma_trans)) {
-		DBG("ERROR: transfer\n");
+		SYS_LOG_ERR("transfer");
 		return;
 	}
 
 	if (dma_transfer_start(dma, chan_id)) {
-		DBG("ERROR: transfer\n");
+		SYS_LOG_ERR("transfer");
 		return;
 	}
 
@@ -124,18 +120,18 @@ void main(void)
 
 	if (transfer_count < TRANSFER_LOOPS) {
 		transfer_count = TRANSFER_LOOPS;
-		DBG("ERROR: unfinished transfer\n");
+		SYS_LOG_ERR("unfinished transfer");
 		if (dma_transfer_stop(dma, chan_id)) {
-			DBG("ERROR: transfer stop\n");
+			SYS_LOG_ERR("transfer stop");
 		}
 	}
 
-	DBG("Each RX buffer should contain the full TX buffer string.\n");
-	DBG("TX data: %s\n", tx_data);
+	SYS_LOG_DBG("Each RX buffer should contain the full TX buffer string.");
+	SYS_LOG_DBG("TX data: %s", tx_data);
 
 	for (int i = 0; i < TRANSFER_LOOPS; i++) {
-		DBG("RX data Loop %d: %s\n", i, rx_data[i]);
+		SYS_LOG_DBG("RX data Loop %d: %s", i, rx_data[i]);
 	}
 
-	DBG("Finished: DMA\n");
+	SYS_LOG_INF("Finished: DMA");
 }