From e87b04caed2d79de61ab2ede85c10de7acdaa3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg2@elzevir.fr>
Date: Tue, 11 Aug 2015 04:09:44 +0200
Subject: [PATCH] Upgrade to latest mbed-drivers version

---
 yotta/data/example-authcrypt/main.cpp  | 7 ++++++-
 yotta/data/example-benchmark/main.cpp  | 7 ++++++-
 yotta/data/example-hashing/main.cpp    | 7 ++++++-
 yotta/data/example-selftest/main.cpp   | 7 ++++++-
 yotta/data/example-tls-client/main.cpp | 9 +++++++--
 yotta/data/module.json                 | 5 ++++-
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/yotta/data/example-authcrypt/main.cpp b/yotta/data/example-authcrypt/main.cpp
index c64cdb499..237751013 100644
--- a/yotta/data/example-authcrypt/main.cpp
+++ b/yotta/data/example-authcrypt/main.cpp
@@ -173,8 +173,9 @@ static int example(void)
 #if defined(TARGET_LIKE_MBED)
 
 #include "mbed/test_env.h"
+#include "minar/minar.h"
 
-int main() {
+static void run() {
     /* Use 115200 bps for consistency with other examples */
     Serial pc(USBTX, USBRX);
     pc.baud(115200);
@@ -186,6 +187,10 @@ int main() {
     MBED_HOSTTEST_RESULT(example() == 0);
 }
 
+void app_start(int, char*[]) {
+    minar::Scheduler::postCallback(FunctionPointer0<void>(run).bind());
+}
+
 #else
 
 int main() {
diff --git a/yotta/data/example-benchmark/main.cpp b/yotta/data/example-benchmark/main.cpp
index be2148ada..23c87b6c3 100644
--- a/yotta/data/example-benchmark/main.cpp
+++ b/yotta/data/example-benchmark/main.cpp
@@ -933,8 +933,9 @@ int benchmark( int argc, char *argv[] )
 }
 
 #include "mbed/test_env.h"
+#include "minar/minar.h"
 
-int main() {
+static void run() {
     /* Use 115200 bps for consistency with other examples */
     Serial pc(USBTX, USBRX);
     pc.baud(115200);
@@ -946,4 +947,8 @@ int main() {
     MBED_HOSTTEST_RESULT(benchmark(0, NULL) == 0);
 }
 
+void app_start(int, char*[]) {
+    minar::Scheduler::postCallback(FunctionPointer0<void>(run).bind());
+}
+
 #endif /* TARGET_LIKE_MBED */
diff --git a/yotta/data/example-hashing/main.cpp b/yotta/data/example-hashing/main.cpp
index f6c1c0a13..09681f92b 100644
--- a/yotta/data/example-hashing/main.cpp
+++ b/yotta/data/example-hashing/main.cpp
@@ -153,8 +153,9 @@ int example(void)
 #if defined(TARGET_LIKE_MBED)
 
 #include "mbed/test_env.h"
+#include "minar/minar.h"
 
-int main() {
+static void run() {
     /* Use 115200 bps for consistency with other examples */
     Serial pc(USBTX, USBRX);
     pc.baud(115200);
@@ -166,6 +167,10 @@ int main() {
     MBED_HOSTTEST_RESULT(example() == 0);
 }
 
+void app_start(int, char*[]) {
+    minar::Scheduler::postCallback(FunctionPointer0<void>(run).bind());
+}
+
 #else
 
 int main() {
diff --git a/yotta/data/example-selftest/main.cpp b/yotta/data/example-selftest/main.cpp
index 1eed97f33..06ab7e915 100644
--- a/yotta/data/example-selftest/main.cpp
+++ b/yotta/data/example-selftest/main.cpp
@@ -244,8 +244,9 @@ int selftest( int argc, char *argv[] )
 #if defined(TARGET_LIKE_MBED)
 
 #include "mbed/test_env.h"
+#include "minar/minar.h"
 
-int main() {
+static void run() {
     /* Use 115200 bps for consistency with other examples */
     Serial pc(USBTX, USBRX);
     pc.baud(115200);
@@ -257,6 +258,10 @@ int main() {
     MBED_HOSTTEST_RESULT(selftest(0, NULL) == 0);
 }
 
+void app_start(int, char*[]) {
+    minar::Scheduler::postCallback(FunctionPointer0<void>(run).bind());
+}
+
 #else
 
 int main() {
diff --git a/yotta/data/example-tls-client/main.cpp b/yotta/data/example-tls-client/main.cpp
index 540d2eabf..8a74b9b32 100644
--- a/yotta/data/example-tls-client/main.cpp
+++ b/yotta/data/example-tls-client/main.cpp
@@ -48,7 +48,7 @@ int main() {
 #define UNSAFE 0
 
 #include "mbed.h"
-#include "mbed-net-lwip-eth/EthernetInterface.h"
+#include "sal-iface-eth/EthernetInterface.h"
 #include "mbed-net-sockets/TCPStream.h"
 #include "minar/minar.h"
 
@@ -495,8 +495,9 @@ int example_client() {
 }
 
 #include "mbed/test_env.h"
+#include "minar/minar.h"
 
-int main() {
+static void run() {
     /* The default 9600 bps is too slow to print full TLS debug info and could
      * cause the other party to time out. Select a higher baud rate for
      * printf(), regardless of debug level for the sake of uniformity. */
@@ -510,4 +511,8 @@ int main() {
     MBED_HOSTTEST_RESULT(example_client() == 0);
 }
 
+void app_start(int, char*[]) {
+    minar::Scheduler::postCallback(FunctionPointer0<void>(run).bind());
+}
+
 #endif /* TARGET_LIKE_MBED */
diff --git a/yotta/data/module.json b/yotta/data/module.json
index 7108ccaf1..eeb8f1094 100644
--- a/yotta/data/module.json
+++ b/yotta/data/module.json
@@ -8,6 +8,9 @@
         "mbed": { "cmsis-core": "~0.2.3" }
     },
     "testTargetDependencies": {
-        "mbed": { "mbed-net-sockets": "~0.2.0" }
+        "mbed": {
+            "mbed-drivers": "~0.6.3",
+            "sockets": "~0.2.1"
+        }
     }
 }