Merge remote-tracking branch 'upstream/master'

syncing my fork with master

Author: U-owner-PC\owner

.travis.yml

@@ -1,5 +1,8 @@
 --- 
-install: "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh > /dev/null"
 python: 
   - "2.7"
 script: "python workspace_tools/build_travis.py"
+install:
+  - "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh > /dev/null"
+  - sudo pip install colorama
+  - sudo pip install prettytable

libraries/mbed/api/mbed.h

@@ -16,7 +16,7 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 93
+#define MBED_LIBRARY_VERSION 94
 
 #include "platform.h"
 

libraries/mbed/common/exit.c

@@ -1,5 +1,5 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
+ * Copyright (c) 2006-2015 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,11 @@
 #include "FilePath.h"
 #include "serial_api.h"
 #include "toolchain.h"
+#include "semihost_api.h"
+#include "mbed_interface.h"
+#if DEVICE_STDIO_MESSAGES
+#include <stdio.h>
+#endif
 #include <errno.h>
 
 #if defined(__ARMCC_VERSION)
@@ -482,6 +487,38 @@ extern "C" caddr_t _sbrk(int incr) {
 #endif
 
 
+#ifdef TOOLCHAIN_GCC_CW
+// TODO: Ideally, we would like to define directly "_ExitProcess"
+extern "C" void mbed_exit(int return_code) {
+#elif defined TOOLCHAIN_GCC_ARM
+extern "C" void _exit(int return_code) {
+#else
+namespace std {
+extern "C" void exit(int return_code) {
+#endif
+
+#if DEVICE_STDIO_MESSAGES
+    fflush(stdout);
+    fflush(stderr);
+#endif
+
+#if DEVICE_SEMIHOST
+    if (mbed_interface_connected()) {
+        semihost_exit();
+    }
+#endif
+    if (return_code) {
+        mbed_die();
+    }
+
+    while (1);
+}
+
+#if !defined(TOOLCHAIN_GCC_ARM) && !defined(TOOLCHAIN_GCC_CW)
+} //namespace std
+#endif
+
+
 namespace mbed {
 
 void mbed_set_unbuffered_stream(FILE *_file) {
@@ -524,11 +561,3 @@ char* mbed_gets(char*s, int size, FILE *_file){
 }
 
 } // namespace mbed
-
-
-
-
-
-
-
-

libraries/mbed/common/retarget.cpp

@@ -21,12 +21,7 @@
 #include "nrf51822.h"
 #include "system_nrf51822.h"
 
-#ifdef TARGET_DELTA_DFCM_NNN40
-
-	#define __SYSTEM_CLOCK      (32000000UL)     /*!< nRF51 devices use a fixed System Clock Frequency of 32MHz */
-#else
-	#define __SYSTEM_CLOCK      (16000000UL)     /*!< nRF51 devices use a fixed System Clock Frequency of 16MHz */
-#endif
+#define __SYSTEM_CLOCK      (16000000UL)     /*!< nRF51 devices use a fixed System Clock Frequency of 16MHz */
 
 static bool is_manual_peripheral_setup_needed(void);
 static bool is_disabled_in_debug_needed(void);

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51822.c

@@ -0,0 +1,13 @@
+
+LR_IROM1 0x00000000 0x40000  {    ; load region size_region (256k)
+  ER_IROM1 0x00000000 0x40000  {  ; load address = execution address
+   *.o (RESET, +First)
+   *(InRoot$$Sections)
+   .ANY (+RO)
+  }
+  ; 8_byte_aligned(16+47 vect * 4 bytes) = 0x100
+  ; 32kB (0x8000) - 0x100 = 0x7F00
+  RW_IRAM1 (0x10000000+0x100) (0x8000-0x100)  {
+   .ANY (+RW +ZI)
+  }
+}