[NANO130] Align with mbed master

1. Remove RTX_CM_lib.h modification for NANO130 platform
2. Remove semaphore test code's speific modification for NANO130 platform
3. Fix duplicate definitions of __NVIC_SetVector/__NVIC_GetVector
4. Add spi_master_block_write()

Author: cyliangtw

.gitignore

@@ -5,6 +5,7 @@ dist
 
 # MANIFEST file
 MANIFEST
+doxygen_objdb_*
 
 # Private settings
 mbed_settings.py

.travis.yml

@@ -2,6 +2,17 @@ python:
   - "2.7"
 
 script:
+  - mkdir BUILD
+# Assert that the Doxygen build produced no warnings.
+# The strange command below asserts that the Doxygen command had an
+# output of zero length
+  - |
+    doxygen doxyfile_options 2>&1 | tee BUILD/doxygen.out && [ ! -s BUILD/doxygen.out ]
+# Assert that all binary libraries are named correctly
+# The strange command below asserts that there are exactly 0 libraries that do
+# not start with lib
+  - |
+    find "(" -name "*.a" -or -name "*.ar" ")" -and -not -name "lib*" | tee BUILD/badlibs | sed -e "s/^/Bad library name found: /" && [ ! -s BUILD/badlibs ]
   - make -C events/equeue test clean
   - PYTHONPATH=. python tools/test/config_test/config_test.py
   - PYTHONPATH=. python tools/test/build_api/build_api_test.py
@@ -13,11 +24,13 @@ script:
   - python tools/build_travis.py
 before_install:
   - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
+  - sudo add-apt-repository -y ppa:libreoffice/libreoffice-4-2
   - sudo apt-get update -qq
-  - sudo apt-get install -qq gcc-arm-none-eabi --force-yes
+  - sudo apt-get install -qq gcc-arm-none-eabi doxygen --force-yes
   # Print versions we use
   - arm-none-eabi-gcc --version
   - python --version
+  - doxygen --version
 install:
   - sudo pip install -r requirements.txt
   - sudo pip install pytest

CONTRIBUTING.md

@@ -5,7 +5,7 @@ All changes in code base should originate from GitHub Issues and take advantage
 Guidelines from this document are created to help new and existing contributors understand process workflow and align to project rules before pull request is submitted. It explains how a participant should do things like format code, test fixes, and submit patches.
 
 ## Where to get more information?
-You can for example read more in our ```docs``` section in [ARMmbed/mbed-os/doc](https://github.com/ARMmbed/mbed-os/tree/master/docs) directory.
+You can read more on our [documentation page](https://docs.mbed.com/).
 
 # How to contribute
 We really appreciate your contributions! We are Open Source project and we need your help. We want to keep it as easy as possible to contribute changes that get things working in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.

Jenkinsfile

@@ -24,8 +24,7 @@ def parallelSteps = mbed.createParalleSteps("mbed-os", targets, toolchains)
 mbed.compile(parallelSteps)
 
 def testApps = [
-  "mbed-os-cliapp",
-  "mbed-client-testapp"
+  "mbed-os-cliapp"
   ]
 
 // buildTestApps accepts array of test application names and a mbed-os branch or PR reference as parameters

README.md

@@ -1,22 +1,30 @@
 # ARM mbed OS
 
-mbed OS is an open-source embedded operating system designed specifically for the "things" in the Internet of Things (IoT). It includes all the features you need to develop a connected product based on an ARM Cortex-M microcontroller.
+mbed OS is an open-source embedded operating system designed for the "things" in the Internet of Things (IoT). mbed OS includes the features you need to develop a connected product using an ARM Cortex-M microcontroller.
 
-mbed OS accelerates the process of creating a connected product by providing a platform operating system that includes robust security foundations, standards based communication capabilities, built-in cloud management services, and drivers for sensors, I/O devices and connectivity. mbed OS is built as a modular, configurable software stack so that you can readily customize it to the device you're developing for, and reduce memory requirements by excluding unnecessary software components.
+mbed OS provides a platform that includes:
+ - Security foundations.
+ - Cloud management services.
+ - Drivers for sensors, I/O devices and connectivity.
+
+mbed OS is modular, configurable software that you can customize it to your device and to reduce memory requirements by excluding unused software.
+
 
-## Current release
+## Release Notes
+
+The [Release Notes](https://docs.mbed.com/docs/mbed-os-release-notes/en/latest/) detail the current release and previous versions.
+
+## Continuous Integration Status
 
-The current release, along with a selection of previous versions are detailed here:
-[Release Notes](https://docs.mbed.com/docs/mbed-os-release-notes/en/latest/)
+We run continuous integration on all of our branches and pull requests to verify the stability of mbed OS. The following are the Travis CI indicators for mbed OS.
+
+ - Master branch [![Master Branch CI Badge](https://travis-ci.org/ARMmbed/mbed-os.svg?branch=master)](https://travis-ci.org/ARMmbed/mbed-os)
+ - Latest release [![Latest Tag CI Badge](https://travis-ci.org/ARMmbed/mbed-os.svg?branch=latest)](https://travis-ci.org/ARMmbed/mbed-os/branches)
 
 ## Getting Started for Developers
 
-Please note that you will require [mbed CLI](https://github.com/ARMmbed/mbed-cli) to build mbed OS. For more details, please read the getting started guide for developers using mbed OS in applications:
- 
-- [Getting Started](https://docs.mbed.com/docs/mbed-os-handbook/en/latest/)
+You need [mbed CLI](https://github.com/ARMmbed/mbed-cli) to build mbed OS. For more details, read the [mbed OS Handbook](https://docs.mbed.com/docs/mbed-os-handbook/en/latest/).
 
 ## Getting Started for Contributors
 
-We have a getting started guide for contributors working on mbed OS:
- 
-- Have a look in the docs directory
+We have a [Contributing and Publishing Guide](https://docs.mbed.com/docs/mbed-os-handbook/en/latest/cont/contributing/) in the mbed OS Handbook.

TESTS/events/queue/main.cpp

@@ -7,6 +7,7 @@
 
 using namespace utest::v1;
 
+#define TEST_EQUEUE_SIZE 1024
 
 // flag for called
 volatile bool touched = false;
@@ -43,7 +44,7 @@ void func0() {
 
 #define SIMPLE_POSTS_TEST(i, ...)                           \
 void simple_posts_test##i() {                               \
-    EventQueue queue;                                       \
+    EventQueue queue(TEST_EQUEUE_SIZE);                     \
                                                             \
     touched = false;                                        \
     queue.call(func##i,##__VA_ARGS__);                      \
@@ -78,7 +79,7 @@ template <int N>
 void call_in_test() {
     Timer tickers[N];
 
-    EventQueue queue;
+    EventQueue queue(TEST_EQUEUE_SIZE);
 
     for (int i = 0; i < N; i++) {
         tickers[i].start();
@@ -92,7 +93,7 @@ template <int N>
 void call_every_test() {
     Timer tickers[N];
 
-    EventQueue queue;
+    EventQueue queue(TEST_EQUEUE_SIZE);
 
     for (int i = 0; i < N; i++) {
         tickers[i].start();
@@ -103,7 +104,7 @@ void call_every_test() {
 }
 
 void allocate_failure_test() {
-    EventQueue queue;
+    EventQueue queue(TEST_EQUEUE_SIZE);
     int id;
 
     for (int i = 0; i < 100; i++) {
@@ -119,7 +120,7 @@ void no() {
 
 template <int N>
 void cancel_test1() {
-    EventQueue queue;
+    EventQueue queue(TEST_EQUEUE_SIZE);
 
     int ids[N];
 
@@ -164,7 +165,7 @@ void count0() {
 
 void event_class_test() {
     counter = 0;
-    EventQueue queue(2048);
+    EventQueue queue(TEST_EQUEUE_SIZE);
 
     Event<void(int, int, int, int, int)> e5(&queue, count5);
     Event<void(int, int, int, int)> e4(&queue, count5, 1);
@@ -187,7 +188,7 @@ void event_class_test() {
 
 void event_class_helper_test() {
     counter = 0;
-    EventQueue queue(2048);
+    EventQueue queue(TEST_EQUEUE_SIZE);
 
     Event<void()> e5 = queue.event(count5, 1, 1, 1, 1, 1);
     Event<void()> e4 = queue.event(count4, 1, 1, 1, 1);
@@ -210,7 +211,7 @@ void event_class_helper_test() {
 
 void event_inference_test() {
     counter = 0;
-    EventQueue queue(2048);
+    EventQueue queue(TEST_EQUEUE_SIZE);
 
     queue.event(count5, 1, 1, 1, 1, 1).post();
     queue.event(count5, 1, 1, 1, 1).post(1);

TESTS/events/timing/main.cpp

@@ -104,7 +104,7 @@ void semaphore_timing_test() {
 
 // Test setup
 utest::v1::status_t test_setup(const size_t number_of_cases) {
-    GREENTEA_SETUP((number_of_cases+1)*TEST_EVENTS_TIMING_TIME, "default_auto");
+    GREENTEA_SETUP((number_of_cases+1)*TEST_EVENTS_TIMING_TIME/1000, "default_auto");
     return verbose_test_setup_handler(number_of_cases);
 }
 

TESTS/mbed_drivers/race_test/main.cpp

@@ -22,22 +22,24 @@
 #include "SingletonPtr.h"
 #include <stdio.h>
 
+#ifdef MBED_RTOS_SINGLE_THREAD
+  #error [NOT_SUPPORTED] test not supported for single threaded enviroment
+#endif
+
 using namespace utest::v1;
 
-#define TEST_STACK_SIZE     1024
+#define TEST_STACK_SIZE     512
 static uint32_t instance_count = 0;
 
 class TestClass {
 public:
     TestClass() {
-        printf("TestClass ctor start\r\n");
         Thread::wait(500);
         instance_count++;
-        printf("TestClass ctor end\r\n");
     }
 
     void do_something() {
-        printf("Do something called\r\n");
+        Thread::wait(100);
     }
 
     ~TestClass() {
@@ -65,7 +67,6 @@ static void main_class_race()
 
 void test_case_func_race()
 {
-    printf("Running function race test\r\n");
     Callback<void()> cb(main_func_race);
     Thread *t1 = new Thread(osPriorityNormal, TEST_STACK_SIZE);
     Thread *t2 = new Thread(osPriorityNormal, TEST_STACK_SIZE);
@@ -91,7 +92,6 @@ void test_case_func_race()
 
 void test_case_class_race()
 {
-    printf("Running class race test\r\n");
     Callback<void()> cb(main_class_race);
     Thread *t1 = new Thread(osPriorityNormal, TEST_STACK_SIZE);
     Thread *t2 = new Thread(osPriorityNormal, TEST_STACK_SIZE);

TESTS/mbed_drivers/stats/main.cpp

@@ -30,7 +30,7 @@ using namespace utest::v1;
 
 #define ALLOCATION_SIZE_DEFAULT 564
 #define ALLOCATION_SIZE_SMALL   124
-#define ALLOCATION_SIZE_LARGE   790
+#define ALLOCATION_SIZE_LARGE   700
 #define ALLOCATION_SIZE_FAIL   (1024 * 1024 *1024)
 
 typedef void* (*malloc_cb_t) (uint32_t size);
@@ -49,7 +49,6 @@ malloc_cb_t malloc_thunk_array[] = {
 
 void test_case_malloc_free_size()
 {
-    printf("Initial print to setup stdio buffers\n");
     mbed_stats_heap_t stats_start;
     mbed_stats_heap_t stats_current;
     void *data;
@@ -127,26 +126,22 @@ void test_case_allocate_fail()
 
 static void* thunk_malloc(uint32_t size)
 {
-    printf("Malloc thunk\n");
     return malloc(size);
 }
 
 static void* thunk_calloc_1(uint32_t size)
 {
-    printf("Calloc thunk 1 byte\n");
     return calloc(size / 1, 1);
 }
 
 static void* thunk_calloc_4(uint32_t size)
 {
-    printf("Calloc thunk 4 bytes\n");
     return calloc(size / 4, 4);
 }
 
 
 static void* thunk_realloc(uint32_t size)
 {
-    printf("Realloc thunk\n");
     return realloc(NULL, size);
 }
 

TESTS/mbed_drivers/stl_features/main.cpp

@@ -32,15 +32,10 @@ using namespace utest::v1;
 #define TABLE_SIZE(TAB) (sizeof(TAB) / sizeof(TAB[0]))
 
 #define NEGATIVE_INTEGERS -32768,-3214,-999,-100,-1,0,1,4231,999,4123,32760,99999
-#define POSITIVE_INTEGERS 32768,3214,999,100,1,0,1,4231,999,4123,32760,99999
 #define FLOATS  0.002,0.92430,15.91320,791.77368,6208.2,25719.4952,426815.982588,6429271.046,42468024.93,212006462.910
 #define FLOATS_STR  "0.002","0.92430","15.91320","791.77368","6208.2","25719.4952","426815.982588","6429271.046","42468024.93","212006462.910"
 
-
 namespace {
-int p_integers[] = {POSITIVE_INTEGERS};
-int n_integers[] = {NEGATIVE_INTEGERS};
-float floats[] = {FLOATS};
 
 template <class T, class F>
 void BubbleSort(T& _array, size_t array_size, F functor) {
@@ -59,62 +54,49 @@ void BubbleSort(T& _array, size_t array_size, F functor) {
     }
 }
 
-struct printInt {
-    void operator()(int i) { printf("%d ", i); }
-};
-
-struct printFloat {
-    void operator()(float f) { printf("%f ", f); }
-};
-
-struct printString {
-    void operator()(const char* s) { printf("%s ", s); }
-};
-
 struct greaterAbs {
     bool operator()(int a, int b) { return abs(a) > abs(b); }
 };
 
 }   // namespace
 
 void test_case_stl_equal() {
-    std::vector<int> v_pints(p_integers, p_integers + TABLE_SIZE(p_integers));
-    TEST_ASSERT_TRUE(std::equal(v_pints.begin(), v_pints.end(), p_integers));
+    const int n_integers[] = {NEGATIVE_INTEGERS};
+    std::vector<int> v_pints(n_integers, n_integers + TABLE_SIZE(n_integers));
+    TEST_ASSERT_TRUE(std::equal(v_pints.begin(), v_pints.end(), n_integers));
 }
 
 void test_case_stl_transform() {
+    const float floats[] = {FLOATS};
     const char* floats_str[] = {FLOATS_STR};
     float floats_transform[TABLE_SIZE(floats_str)] = {0.0};
     std::transform(floats_str, floats_str + TABLE_SIZE(floats_str), floats_transform, atof);
-    //printf("stl_transform::floats_str: ");
-    //std::for_each(floats_str, floats_str + TABLE_SIZE(floats_str), printString());
-    //printf("stl_transform::floats_transform: ");
-    //std::for_each(floats_transform, floats_transform + TABLE_SIZE(floats_transform), printFloat());
-    //printf("\n");
 
     TEST_ASSERT_TRUE(std::equal(floats_transform, floats_transform + TABLE_SIZE(floats_transform), floats));
 }
 
 void test_case_stl_sort_greater() {
-    std::vector<int> v_nints_1(n_integers, n_integers + TABLE_SIZE(n_integers));
-    std::vector<int> v_nints_2(n_integers, n_integers + TABLE_SIZE(n_integers));
+    int n_integers[] = {NEGATIVE_INTEGERS};
+    int n_integers2[] = {NEGATIVE_INTEGERS};
 
-    BubbleSort(v_nints_1, v_nints_1.size(), std::greater<int>());
-    std::sort(v_nints_2.begin(), v_nints_2.end(), std::greater<int>());
+    BubbleSort(n_integers, TABLE_SIZE(n_integers), std::greater<int>());
+    std::sort(n_integers2, n_integers2 + TABLE_SIZE(n_integers2), std::greater<int>());
 
-    TEST_ASSERT_TRUE(std::equal(v_nints_1.begin(), v_nints_1.end(), v_nints_2.begin()));
+    TEST_ASSERT_TRUE(std::equal(n_integers2, n_integers2 + TABLE_SIZE(n_integers2), n_integers));
 }
 
+
 void test_case_stl_sort_abs() {
-    std::vector<int> v_nints_1(n_integers, n_integers + TABLE_SIZE(n_integers));
-    std::vector<int> v_nints_2(n_integers, n_integers + TABLE_SIZE(n_integers));
+    int n_integers[] = {NEGATIVE_INTEGERS};
+    int n_integers2[] = {NEGATIVE_INTEGERS};
 
-    BubbleSort(v_nints_1, v_nints_1.size(), greaterAbs());
-    std::sort(v_nints_2.begin(), v_nints_2.end(), greaterAbs());
+    BubbleSort(n_integers, TABLE_SIZE(n_integers), greaterAbs());
+    std::sort(n_integers2, n_integers2 + TABLE_SIZE(n_integers2), greaterAbs());
 
-    TEST_ASSERT_TRUE(std::equal(v_nints_1.begin(), v_nints_1.end(), v_nints_2.begin()));
+    TEST_ASSERT_TRUE(std::equal(n_integers2, n_integers2 + TABLE_SIZE(n_integers2), n_integers));
 }
 
+
 utest::v1::status_t greentea_failure_handler(const Case *const source, const failure_t reason) {
     greentea_case_failure_abort_handler(source, reason);
     return STATUS_CONTINUE;

TESTS/mbed_hal/flash/functional_tests/main.cpp

@@ -24,7 +24,6 @@
 
 #include "mbed.h"
 #include "flash_api.h"
-#include "flash_data.h"
 
 using namespace utest::v1;
 
@@ -49,6 +48,7 @@ static void erase_range(flash_t *flash, uint32_t addr, uint32_t size)
         TEST_ASSERT_NOT_EQUAL(0, sector_size);
         int32_t ret = flash_erase_sector(flash, addr);
         TEST_ASSERT_EQUAL_INT32(0, ret);
+        addr += sector_size;
         size = size > sector_size ? size - sector_size : 0;
     }
 }