From f78fc42cf076409dabf0383694b0278ac7b49949 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 9 Sep 2013 15:02:33 -0600 Subject: [PATCH] USB monitor extended so that it can also be used with USB host trace data --- configs/sama5d3x-ek/src/sama5d3x-ek.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/configs/sama5d3x-ek/src/sama5d3x-ek.h b/configs/sama5d3x-ek/src/sama5d3x-ek.h index bfcb272f2a7..8bfddb33707 100644 --- a/configs/sama5d3x-ek/src/sama5d3x-ek.h +++ b/configs/sama5d3x-ek/src/sama5d3x-ek.h @@ -172,8 +172,19 @@ /* Check if we should enable the USB monitor before starting NSH */ -#if !defined(HAVE_USBDEV) || !defined(CONFIG_USBDEV_TRACE) || \ - !defined(CONFIG_SYSTEM_USBMONITOR) +#ifndef CONFIG_SYSTEM_USBMONITOR +# undef HAVE_USBMONITOR +#endif + +#ifndef HAVE_USBDEV +# undef CONFIG_USBDEV_TRACE +#endif + +#ifndef HAVE_USBHOST +# undef CONFIG_USBHOST_TRACE +#endif + +#if !defined(CONFIG_USBDEV_TRACE) && !defined(CONFIG_USBHOST_TRACE) # undef HAVE_USBMONITOR #endif