This commit has the following changes:

- flush3.cpp recoding to remove code under license.
- removal of use of mbed-drivers/mbed.h in #include directives.
- reinstatement of trace macro in example1.cpp.
- correction of logging variables in configuration_store.cpp.

Author: simonqhughes

features/storage/TESTS/cfstore/example1/example1.cpp

@@ -54,8 +54,7 @@
  */
 #if defined __MBED__ && ! defined TOOLCHAIN_GCC_ARM
 
-
-#include "mbed-drivers/mbed.h"
+#include "mbed.h"
 #include "cfstore_config.h"
 #include "Driver_Common.h"
 #include "cfstore_debug.h"
@@ -159,14 +158,12 @@ using namespace utest::v1;
         }                                                 \
     }while(0);
 
-/* todo: re-instate 20160704: arm testing*/
 #define CFSTORE_EX1_LOG(_fmt, ...)                        \
   do                                                      \
   {                                                       \
         printf(_fmt, __VA_ARGS__);                        \
   }while(0);
 
-//#define CFSTORE_EX1_LOG(_fmt, ...)  do{}while(0);
 
 const char* cfstore_ex_opcode_str[] =
 {

features/storage/TESTS/cfstore/flush/flush.cpp

@@ -20,7 +20,7 @@
 #if defined __MBED__ && ! defined TOOLCHAIN_GCC_ARM
 
 
-#include "mbed-drivers/mbed.h"
+#include "mbed.h"
 #include "cfstore_config.h"
 #include "Driver_Common.h"
 #include "cfstore_debug.h"