From 307c6177df9c9bce3d361bdb2dee278874adbf7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 18 Feb 2013 00:47:22 +0100 Subject: [PATCH] U-Boot: cleanup OpenFirmware wrapper tracing --- .../kernel/platform/u-boot/openfirmware.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/system/kernel/platform/u-boot/openfirmware.cpp b/src/system/kernel/platform/u-boot/openfirmware.cpp index 12115b12b6..9d2431551c 100644 --- a/src/system/kernel/platform/u-boot/openfirmware.cpp +++ b/src/system/kernel/platform/u-boot/openfirmware.cpp @@ -15,6 +15,13 @@ extern "C" { #include }; +#define TRACE_OF +#ifdef TRACE_OF +# define TRACE(x) dprintf x +#else +# define TRACE(x) ; +#endif + // FIXME: HACK: until we support multiple platforms at once in the kernel. @@ -92,7 +99,8 @@ of_finddevice(const char *device) name = fdt_get_alias(gFDT, device); node = fdt_path_offset(gFDT, name); -dprintf("of_finddevice('%s') name='%s' node=%d ret=%d\n", device, name, node, fdt2of(node)); + TRACE(("of_finddevice('%s') name='%s' node=%d ret=%d\n", device, name, node, + fdt2of(node))); return fdt2of(node); } @@ -152,11 +160,15 @@ of_instance_to_package(int instance) int of_getprop(int package, const char *property, void *buffer, int bufferSize) { -int oldSize = bufferSize; + int oldSize = bufferSize; const void *p = fdt_getprop(gFDT, package, property, &bufferSize); -dprintf("of_getprop(%d, '%s', , %d) =%p sz=%d ret=%d\n", package, property, oldSize, p, bufferSize, fdt2of(bufferSize)); + + TRACE(("of_getprop(%d, '%s', , %d) =%p sz=%d ret=%d\n", package, property, + oldSize, p, bufferSize, fdt2of(bufferSize))); + if (p == NULL) return fdt2of(bufferSize); + memcpy(buffer, p, bufferSize); return bufferSize; }