From 1d881c2d35e5a64cf3a34baa88142348e6a4505b Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 30 Apr 2015 13:02:38 -0600
Subject: [PATCH] STM32F4-Discovery: Add another missing configuration; fix
 names of configurations

---
 configs/stm32f4discovery/Kconfig         |  7 ++++++-
 configs/stm32f4discovery/README.txt      |  4 ++--
 configs/stm32f4discovery/src/stm32_usb.c | 12 ++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/configs/stm32f4discovery/Kconfig b/configs/stm32f4discovery/Kconfig
index cd4eb3e619..661367965e 100644
--- a/configs/stm32f4discovery/Kconfig
+++ b/configs/stm32f4discovery/Kconfig
@@ -12,11 +12,16 @@ config STM32F4DISBB
 		Select if you are using the STM32F4DIS-BB base board with the
 		STM32F4Discovery.
 
-config USBHOST_STACKSIZE
+config STM32F4DISCO_USBHOST_STACKSIZE
 	int "USB host waiter stack size"
 	default 1024
 	depends on USBHOST
 
+config STM32F4DISCO_USBHOST_PRIO
+	int "USB host waiter task priority"
+	default 100
+	depends on USBHOST
+
 config PM_BUTTONS
 	bool "PM button support"
 	default n
diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt
index 760f76d53b..10979e2604 100644
--- a/configs/stm32f4discovery/README.txt
+++ b/configs/stm32f4discovery/README.txt
@@ -1696,7 +1696,7 @@ Where <subdir> is one of the following:
          To be determined
 
        Board Selection ->
-         CONFIG_USBHOST_STACKSIZE=2048 (bigger than it needs to be)
+         CONFIG_STM32F4DISCO_USBHOST_STACKSIZE=2048 (bigger than it needs to be)
 
        RTOS Features -> Work Queue Support
          CONFIG_SCHED_LPWORK=y     : Low priority queue support is needed
@@ -1715,7 +1715,7 @@ Where <subdir> is one of the following:
 
        STATUS:
        2015-04-30
-          Just beginning to test.
+          Appears to be fully functional.
 
   nxlines:
   ------
diff --git a/configs/stm32f4discovery/src/stm32_usb.c b/configs/stm32f4discovery/src/stm32_usb.c
index 073552c254..96e5a2a37c 100644
--- a/configs/stm32f4discovery/src/stm32_usb.c
+++ b/configs/stm32f4discovery/src/stm32_usb.c
@@ -69,12 +69,12 @@
 #  undef HAVE_USB
 #endif
 
-#ifndef CONFIG_USBHOST_DEFPRIO
-#  define CONFIG_USBHOST_DEFPRIO 50
+#ifndef CONFIG_STM32F4DISCO_USBHOST_PRIO
+#  define CONFIG_STM32F4DISCO_USBHOST_PRIO 100
 #endif
 
-#ifndef CONFIG_USBHOST_STACKSIZE
-#  define CONFIG_USBHOST_STACKSIZE 1024
+#ifndef CONFIG_STM32F4DISCO_USBHOST_STACKSIZE
+#  define CONFIG_STM32F4DISCO_USBHOST_STACKSIZE 1024
 #endif
 
 /************************************************************************************
@@ -227,8 +227,8 @@ int stm32_usbhost_initialize(void)
 
       uvdbg("Start usbhost_waiter\n");
 
-      pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO,
-                        CONFIG_USBHOST_STACKSIZE,
+      pid = task_create("usbhost", CONFIG_STM32F4DISCO_USBHOST_PRIO,
+                        CONFIG_STM32F4DISCO_USBHOST_STACKSIZE,
                         (main_t)usbhost_waiter, (FAR char * const *)NULL);
       return pid < 0 ? -ENOEXEC : OK;
     }