From 03c40a268539d05fd4185b26e8e67a50d3ac3337 Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Tue, 23 Aug 2016 13:15:39 -0700 Subject: [PATCH] Revert "misc: Remove generic PRINT macros from pci samples" This reverts commit a0007012b7864e9f90991d6f70f049fa9dbc048d. Change-Id: I72f4b8adfc33c833116fef9fc1cd8c542f3979b0 Signed-off-by: Andrew Boie --- samples/drivers/pci_enum/prj.conf | 1 - samples/drivers/pci_enum/src/pci_enum.c | 13 +++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/samples/drivers/pci_enum/prj.conf b/samples/drivers/pci_enum/prj.conf index 312388f1a49..a6d8fd65900 100644 --- 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 index 9bfbdb552cf..865be349d61 100644 --- a/samples/drivers/pci_enum/src/pci_enum.c +++ b/samples/drivers/pci_enum/src/pci_enum.c @@ -20,8 +20,13 @@ #include #include -#define SYS_LOG_LEVEL SYS_LOG_LEVEL_INFO -#include +#if defined(CONFIG_STDOUT_CONSOLE) +#include +#define PRINT printf +#else +#include +#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 */