From 08e6d98c0d7e243f00e6020e12697ff29c4e0f2b Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 30 Jun 2012 19:27:27 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4369
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ARMCM4-STM32F407-LWIP-FATFS-USB/chconf.h |  8 ++++----
 demos/ARMCM4-STM32F407-LWIP-FATFS-USB/main.c   | 11 ++++++++---
 readme.txt                                     |  3 +++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/demos/ARMCM4-STM32F407-LWIP-FATFS-USB/chconf.h b/demos/ARMCM4-STM32F407-LWIP-FATFS-USB/chconf.h
index 3710d7d4f..b1f2cd62c 100644
--- a/demos/ARMCM4-STM32F407-LWIP-FATFS-USB/chconf.h
+++ b/demos/ARMCM4-STM32F407-LWIP-FATFS-USB/chconf.h
@@ -361,7 +361,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE
+#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
 #endif
 
 /**
@@ -395,7 +395,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             TRUE
+#define CH_DBG_ENABLE_TRACE             FALSE
 #endif
 
 /**
@@ -409,7 +409,7 @@
  *          @p panic_msg variable set to @p NULL.
  */
 #if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       TRUE
+#define CH_DBG_ENABLE_STACK_CHECK       FALSE
 #endif
 
 /**
@@ -421,7 +421,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#define CH_DBG_FILL_THREADS             TRUE
+#define CH_DBG_FILL_THREADS             FALSE
 #endif
 
 /**
diff --git a/demos/ARMCM4-STM32F407-LWIP-FATFS-USB/main.c b/demos/ARMCM4-STM32F407-LWIP-FATFS-USB/main.c
index 6e11d3a03..ae0104e31 100644
--- a/demos/ARMCM4-STM32F407-LWIP-FATFS-USB/main.c
+++ b/demos/ARMCM4-STM32F407-LWIP-FATFS-USB/main.c
@@ -110,13 +110,13 @@ static void tmr_init(void *p) {
 /**
  * @brief FS object.
  */
-FATFS SDC_FS;
+static FATFS SDC_FS;
 
 /* FS mounted and ready.*/
 static bool_t fs_ready = FALSE;
 
 /* Generic large buffer.*/
-uint8_t fbuff[1024];
+static uint8_t fbuff[1024];
 
 static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
   FRESULT res;
@@ -597,7 +597,7 @@ static msg_t Thread1(void *arg) {
   chRegSetThreadName("blinker");
   while (TRUE) {
     palTogglePad(GPIOC, GPIOC_LED);
-    chThdSleepMilliseconds(cnt ? 500 : 125);
+    chThdSleepMilliseconds(fs_ready ? 125 : 500);
   }
 }
 
@@ -631,6 +631,11 @@ int main(void) {
   sduStart(&SDU1, &serusbcfg);
   usbConnectBus(serusbcfg.usbp);
 
+  /*
+   * Shell manager initialization.
+   */
+  shellInit();
+
   /*
    * Activates the serial driver 6 and SDC driver 1 using default
    * configuration.
diff --git a/readme.txt b/readme.txt
index 277645838..9fea67c80 100644
--- a/readme.txt
+++ b/readme.txt
@@ -161,6 +161,9 @@
   3484947)(backported to 2.4.1).
 - FIX: Fixed various minor documentation errors (bug 3484942)(backported
   to 2.4.1).
+- NEW: Added support for the Olimex STM32-E407 board. Added an integrated
+  demo including USB-CDC, lwIP with web server, FatFs and shell, all running
+  together.
 - NEW: Added an experimental and unsupported STM8 port for the IAR compiler,
   contributed by "king2".
 - NEW: Updated STM8 header files to latest versions from ST.