Revert "misc: Remove generic PRINT macros from pci samples"

Andrew Boie · Andrew Boie · commit 03c40a268539 · 2016-08-23T13:19:45.000-07:00
This reverts commit a000701. Change-Id: I72f4b8adfc33c833116fef9fc1cd8c542f3979b0 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
diff --git a/samples/drivers/pci_enum/prj.conf b/samples/drivers/pci_enum/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_PCI_ENUMERATION=y
 CONFIG_PCI_DEBUG=y
-CONFIG_SYS_LOG=y
diff --git a/samples/drivers/pci_enum/src/pci_enum.c b/samples/drivers/pci_enum/src/pci_enum.c
@@ -20,8 +20,13 @@
 #include <stdint.h>
 #include <pci/pci.h>
 
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_INFO
-#include <misc/sys_log.h>
+#if defined(CONFIG_STDOUT_CONSOLE)
+#include <stdio.h>
+#define PRINT           printf
+#else
+#include <misc/printk.h>
+#define PRINT           printk
+#endif
 
 void pci_enumerate(void)
 {
@@ -54,7 +59,7 @@ void task_enum_pci(void)
 	}
 
 	pci_enumerate();
-	SYS_LOG_INF("Enumeration complete on %s", CONFIG_ARCH);
+	PRINT("Enumeration complete on %s", CONFIG_ARCH);
 	done = 1;
 }
 
@@ -63,7 +68,7 @@ void task_enum_pci(void)
 void main(void)
 {
 	pci_enumerate();
-	SYS_LOG_INF("Enumeration complete on %s", CONFIG_ARCH);
+	PRINT("Enumeration complete on %s", CONFIG_ARCH);
 }
 
 #endif /* CONFIG_MICROKERNEL */

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,13 @@`
`20`	`20`	`#include <stdint.h>`
`21`	`21`	`#include <pci/pci.h>`
`22`	`22`
`23`		`-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_INFO`
`24`		`-#include <misc/sys_log.h>`
	`23`	`+#if defined(CONFIG_STDOUT_CONSOLE)`
	`24`	`+#include <stdio.h>`
	`25`	`+#define PRINT printf`
	`26`	`+#else`
	`27`	`+#include <misc/printk.h>`
	`28`	`+#define PRINT printk`
	`29`	`+#endif`
`25`	`30`
`26`	`31`	`void pci_enumerate(void)`
`27`	`32`	`{`
`@@ -54,7 +59,7 @@ void task_enum_pci(void)`
`54`	`59`	`}`
`55`	`60`
`56`	`61`	`pci_enumerate();`
`57`		`- SYS_LOG_INF("Enumeration complete on %s", CONFIG_ARCH);`
	`62`	`+ PRINT("Enumeration complete on %s", CONFIG_ARCH);`
`58`	`63`	`done = 1;`
`59`	`64`	`}`
`60`	`65`
`@@ -63,7 +68,7 @@ void task_enum_pci(void)`
`63`	`68`	`void main(void)`
`64`	`69`	`{`
`65`	`70`	`pci_enumerate();`
`66`		`- SYS_LOG_INF("Enumeration complete on %s", CONFIG_ARCH);`
	`71`	`+ PRINT("Enumeration complete on %s", CONFIG_ARCH);`
`67`	`72`	`}`
`68`	`73`
`69`	`74`	`#endif /* CONFIG_MICROKERNEL */`