Merge branch 'master' into ti

2014-05-12 14:02:22 -07:00
parent b19a7e2238 7f938f3bdf
commit 28b6c5b998
178 changed files with 16255 additions and 45461 deletions
@@ -31,12 +31,19 @@
 #endif

 #if defined(CYASSL_MDK_ARM)
-    #include <stdio.h>
-    #include <string.h>
-    #include <rtl.h>
-    #include "cyassl_MDK_ARM.h"
-#endif
+        #include <stdio.h>
+        #include <string.h>

+        #if defined(CYASSL_MDK5)
+            #include "cmsis_os.h"
+            #include "rl_fs.h" 
+            #include "rl_net.h" 
+        #else
+            #include "rtl.h"
+        #endif
+
+        #include "cyassl_MDK_ARM.h"
+#endif
 #include <cyassl/openssl/ssl.h>
 #include <cyassl/test.h>

@@ -132,11 +139,6 @@ static void Usage(void)
 #endif
 }

-#ifdef CYASSL_MDK_SHELL
-#define exit(code) return(code)
-#endif
-
-
 THREAD_RETURN CYASSL_THREAD server_test(void* args)
 {
    SOCKET_T sockfd   = 0;