You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/03/29 04:34:10 UTC
[incubator-nuttx] branch master updated: usbhost: Do not disable
usb monitor if usb host is enabled but dev is not
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 4851d23 usbhost: Do not disable usb monitor if usb host is enabled but dev is not
4851d23 is described below
commit 4851d232c0f874a37c44b87516675928ca031156
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Sun Mar 28 12:45:15 2021 -0700
usbhost: Do not disable usb monitor if usb host is enabled but dev is not
---
boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc_h3131.h | 12 ++++++++++--
boards/arm/sam34/sam4e-ek/src/sam4e-ek.h | 10 +++++++++-
boards/arm/samv7/same70-xplained/src/same70-xplained.h | 10 +++++++++-
boards/arm/samv7/samv71-xult/src/samv71-xult.h | 10 +++++++++-
boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h | 18 +++++++++++-------
boards/arm/stm32/mikroe-stm32f4/src/stm32_appinit.c | 16 +++++++++++++---
.../stm32/olimex-stm32-e407/src/olimex-stm32-e407.h | 18 ++++++++++++++----
boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c | 18 ++++++++++++++----
.../stm32/olimex-stm32-h407/src/olimex-stm32-h407.h | 18 ++++++++++++------
boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c | 18 ++++++++++++++----
.../stm32/olimex-stm32-p407/src/olimex-stm32-p407.h | 18 ++++++++++++++----
boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c | 16 +++++++++++++---
.../arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h | 16 +++++++++++++---
.../arm/stm32/stm32f4discovery/src/stm32f4discovery.h | 18 ++++++++++++++----
boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h | 18 ++++++++++++++----
.../stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h | 18 ++++++++++++++----
.../stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h | 18 ++++++++++++++----
boards/mips/pic32mx/sure-pic32mx/src/pic32mx_appinit.c | 14 ++++++++++----
18 files changed, 221 insertions(+), 63 deletions(-)
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc_h3131.h b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc_h3131.h
index 6e1dc96..7f59136 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc_h3131.h
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc_h3131.h
@@ -62,13 +62,21 @@
# undef HAVE_USBHOST
#endif
-/* Check if we need to support the USB monitor */
+/* Check if we should enable the USB monitor before starting NSH */
+
+#ifndef CONFIG_USBMONITOR
+# undef HAVE_USBMONITOR
+#endif
+
+#ifndef HAVE_USBDEV
+# undef CONFIG_USBDEV_TRACE
+#endif
#ifndef HAVE_USBHOST
# undef CONFIG_USBHOST_TRACE
#endif
-#if !defined(CONFIG_USBMONITOR) || !defined(CONFIG_USBHOST_TRACE)
+#if !defined(CONFIG_USBDEV_TRACE) && !defined(CONFIG_USBHOST_TRACE)
# undef HAVE_USBMONITOR
#endif
diff --git a/boards/arm/sam34/sam4e-ek/src/sam4e-ek.h b/boards/arm/sam34/sam4e-ek/src/sam4e-ek.h
index 54a7e61..f0c1f64 100644
--- a/boards/arm/sam34/sam4e-ek/src/sam4e-ek.h
+++ b/boards/arm/sam34/sam4e-ek/src/sam4e-ek.h
@@ -115,11 +115,19 @@
/* Check if we should enable the USB monitor before starting NSH */
+#ifndef CONFIG_USBMONITOR
+# undef HAVE_USBMONITOR
+#endif
+
#ifndef HAVE_USBDEV
# undef CONFIG_USBDEV_TRACE
#endif
-#if !defined(CONFIG_USBMONITOR) || !defined(CONFIG_USBDEV_TRACE)
+#ifndef HAVE_USBHOST
+# undef CONFIG_USBHOST_TRACE
+#endif
+
+#if !defined(CONFIG_USBDEV_TRACE) && !defined(CONFIG_USBHOST_TRACE)
# undef HAVE_USBMONITOR
#endif
diff --git a/boards/arm/samv7/same70-xplained/src/same70-xplained.h b/boards/arm/samv7/same70-xplained/src/same70-xplained.h
index ff8ec2d..1a18d06 100644
--- a/boards/arm/samv7/same70-xplained/src/same70-xplained.h
+++ b/boards/arm/samv7/same70-xplained/src/same70-xplained.h
@@ -143,11 +143,19 @@
/* Check if we should enable the USB monitor before starting NSH */
+#ifndef CONFIG_USBMONITOR
+# undef HAVE_USBMONITOR
+#endif
+
#ifndef HAVE_USBDEV
# undef CONFIG_USBDEV_TRACE
#endif
-#if !defined(CONFIG_USBMONITOR) || !defined(CONFIG_USBDEV_TRACE)
+#ifndef HAVE_USBHOST
+# undef CONFIG_USBHOST_TRACE
+#endif
+
+#if !defined(CONFIG_USBDEV_TRACE) && !defined(CONFIG_USBHOST_TRACE)
# undef HAVE_USBMONITOR
#endif
diff --git a/boards/arm/samv7/samv71-xult/src/samv71-xult.h b/boards/arm/samv7/samv71-xult/src/samv71-xult.h
index 6f03f3b..767dc69 100644
--- a/boards/arm/samv7/samv71-xult/src/samv71-xult.h
+++ b/boards/arm/samv7/samv71-xult/src/samv71-xult.h
@@ -151,11 +151,19 @@
/* Check if we should enable the USB monitor before starting NSH */
+#ifndef CONFIG_USBMONITOR
+# undef HAVE_USBMONITOR
+#endif
+
#ifndef HAVE_USBDEV
# undef CONFIG_USBDEV_TRACE
#endif
-#if !defined(CONFIG_USBMONITOR) || !defined(CONFIG_USBDEV_TRACE)
+#ifndef HAVE_USBHOST
+# undef CONFIG_USBHOST_TRACE
+#endif
+
+#if !defined(CONFIG_USBDEV_TRACE) && !defined(CONFIG_USBHOST_TRACE)
# undef HAVE_USBMONITOR
#endif
diff --git a/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h
index f223fbb..605e305 100644
--- a/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h
+++ b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h
@@ -106,21 +106,25 @@
/* Can't support USB device feature if USB OTG FS is not enabled */
-#ifndef CONFIG_STM32_OTGFS
+#if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBDEV)
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
-/* Can't support USB device monitor if USB device is not enabled */
+/* Check if we should enable the USB monitor before starting NSH */
-#ifndef CONFIG_USBDEV
-# undef HAVE_USBDEV
+#ifndef CONFIG_USBMONITOR
# undef HAVE_USBMONITOR
#endif
-/* Check if we should enable the USB monitor before starting NSH */
+#ifndef HAVE_USBDEV
+# undef CONFIG_USBDEV_TRACE
+#endif
+
+#ifndef HAVE_USBHOST
+# undef CONFIG_USBHOST_TRACE
+#endif
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) && !defined(CONFIG_USBHOST_TRACE)
# undef HAVE_USBMONITOR
#endif
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_appinit.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_appinit.c
index 0cb0df0..0a1906e 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_appinit.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_appinit.c
@@ -81,14 +81,12 @@
#ifndef CONFIG_STM32_OTGFS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB device is USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -99,7 +97,19 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h
index 0a0d6c3..caacf49 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h
+++ b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h
@@ -65,14 +65,12 @@
#ifndef CONFIG_STM32_OTGFS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
-/* Can't support USB device monitor if USB device is not enabled */
+/* Can't support USB device if USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -83,7 +81,19 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
index 3c50f5c..99fe8ee 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
+++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
@@ -68,14 +68,12 @@
#ifndef CONFIG_STM32_OTGHS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
-/* Can't support USB device monitor if USB device is not enabled */
+/* Can't support USB device USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -86,7 +84,19 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h b/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h
index 9879e07..2a737b6 100644
--- a/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h
+++ b/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h
@@ -61,14 +61,12 @@
#ifndef CONFIG_STM32_OTGHS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
-/* Can't support USB device monitor if USB device is not enabled */
+/* Can't support USB device if USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -79,12 +77,20 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#ifndef CONFIG_USBMONITOR
# undef HAVE_USBMONITOR
#endif
-#if !defined(CONFIG_STM32_CAN1) && !defined(CONFIG_STM32_CAN2)
-# undef CONFIG_CAN
+#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
/* Can't support MMC/SD features if mountpoints are disabled or if SDIO
diff --git a/boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c
index 374dee3..081a9e9 100644
--- a/boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c
+++ b/boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c
@@ -57,14 +57,12 @@
#ifndef CONFIG_STM32_OTGFS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
-/* Can't support USB device monitor if USB device is not enabled */
+/* Can't support USB device if USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -76,7 +74,19 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h b/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h
index bb80b05..1c5a847 100644
--- a/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h
+++ b/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h
@@ -105,14 +105,12 @@
#ifndef CONFIG_STM32_OTGFS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
-/* Can't support USB device monitor if USB device is not enabled */
+/* Can't support USB device if USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -123,7 +121,19 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c b/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c
index 9f9c291..bb120cf 100644
--- a/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c
@@ -57,19 +57,29 @@
#ifndef CONFIG_STM32_USB
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB device is USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h
index 4d450b1..553c862 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h
@@ -69,14 +69,12 @@
#ifndef CONFIG_STM32_OTGHS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB device monitor if USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -87,7 +85,19 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h b/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
index 69b5260..417fd02 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
@@ -68,14 +68,12 @@
#ifndef CONFIG_STM32_OTGFS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
-/* Can't support USB device monitor if USB device is not enabled */
+/* Can't support USB device if USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -86,7 +84,19 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h b/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h
index 6919b81..5a3077e 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h
@@ -62,14 +62,12 @@
#ifndef CONFIG_STM32H7_OTGFS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
-/* Can't support USB device monitor if USB device is not enabled */
+/* Can't support USB device if USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -80,7 +78,19 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h
index 5463b60..01b7763 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h
@@ -135,14 +135,12 @@
#ifndef CONFIG_STM32L4_OTGFS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
-/* Can't support USB device monitor if USB device is not enabled */
+/* Can't support USB device if USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -153,7 +151,19 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h
index 907bab7..a91f49e 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h
@@ -86,14 +86,12 @@
#ifndef CONFIG_STM32L4_OTGFS
# undef HAVE_USBDEV
# undef HAVE_USBHOST
-# undef HAVE_USBMONITOR
#endif
-/* Can't support USB device monitor if USB device is not enabled */
+/* Can't support USB device if USB device is not enabled */
#ifndef CONFIG_USBDEV
# undef HAVE_USBDEV
-# undef HAVE_USBMONITOR
#endif
/* Can't support USB host is USB host is not enabled */
@@ -104,7 +102,19 @@
/* Check if we should enable the USB monitor before starting NSH */
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#ifndef CONFIG_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
diff --git a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_appinit.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_appinit.c
index 82c23b7..55c8616 100644
--- a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_appinit.c
+++ b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_appinit.c
@@ -130,15 +130,21 @@
/* USB Monitor */
-/* Can't support USB device monitor if USB device is not enabled */
+/* Check if we should enable the USB monitor before starting NSH */
-#ifndef CONFIG_USBDEV
+#ifndef CONFIG_USBMONITOR
# undef NSH_HAVE_USBMONITOR
#endif
-/* Check if we should enable the USB monitor before starting NSH */
+#ifndef NSH_HAVE_USBDEV
+# undef CONFIG_USBDEV_TRACE
+#endif
+
+#ifndef NSH_HAVE_USBHOST
+# undef CONFIG_USBHOST_TRACE
+#endif
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) && !defined(CONFIG_USBHOST_TRACE)
# undef NSH_HAVE_USBMONITOR
#endif