Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CMSIS-Core and RTX to version 5 #4294

Merged
merged 24 commits into from
Jun 3, 2017
Merged

Update CMSIS-Core and RTX to version 5 #4294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fd23377
Remove RTOS and CMSIS files
c1728p9 May 11, 2017
a9a29a4
Pull in CMSIS 5 files
bulislaw May 15, 2017
25021f2
RTX5: uVisor: Defer to uVisor for SVCall priority
Patater Jan 30, 2017
756e0ca
RTX5: uVisor: Add OsEventObserver
Patater Jan 19, 2017
24c60f6
RTX5: uVisor: Extend thread control block with context
Patater Jan 25, 2017
7ae2e6e
RTX5: uVisor: Use OsEventObserver
Patater Jan 19, 2017
7b022f8
Modify CMSIS 5 so it is suitable for mbed-os
bulislaw May 15, 2017
b97ffe8
CMSIS5: Replace target defined NVIC_Set/GetVector with CMSIS implemen…
bulislaw Oct 24, 2016
b793a3f
Update codebase for CMSIS5/RTX5
bulislaw May 15, 2017
6be9e47
uVisor: Import RTX5-capable uVisor
Patater Apr 6, 2017
0016bd4
uVisor: Re-import RTX5-capable uVisor
Patater May 11, 2017
f194ea7
Remove redefinitions of register macros from target code
bulislaw May 16, 2017
abcae6f
Updated driver binaries for feature_cmsis5 as v2.0 rc1
May 19, 2017
535ee8b
Make stack sizes configurable by the app
bulislaw May 22, 2017
05548e7
Rename directories rtx->rtx4 rtx2->rtx5
bulislaw May 23, 2017
b01f13d
Make sure all system threads and mutexes have clear names
bulislaw May 23, 2017
e66f9ee
Fix IAR coding style and thread/mutex namingin mbed_boot.c
bulislaw May 23, 2017
0064df1
Add name parameter for C++ mutex wrapper
bulislaw May 23, 2017
85cc9c8
Remove deprecated RTX4 config options
bulislaw May 23, 2017
a8229b5
Make sure all RTOS attribute structures are 0-ed before use
bulislaw May 24, 2017
80cb65e
Add more verbose RTOS error messages
bulislaw May 24, 2017
f03509c
Add up OS_MUTEX_NUM for ARMCC compiler
Archcady May 15, 2017
39a1b39
Bump number of ARMC mutexes to fix PAL test failure
May 26, 2017
c674ee2
Jenkinsfile: remove client app test temporarily
0xc0170 Jun 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion TESTS/mbedmicro-rtos-mbed/mutex/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ void test_dual_thread_lock_lock_thread(Mutex *mutex)
uint32_t start = us_ticker_read();

osStatus stat = mutex->lock(TEST_HALF_SEC_MS);
TEST_ASSERT_EQUAL(stat, osEventTimeout);
TEST_ASSERT_EQUAL(stat, osErrorTimeout);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can the event codes (osEventTimeout) be typedef or defined as error codes (osErrorTimeout) so RTX5 is more backwards compatible?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are defined in the CMSIS compatibility layer already.

TEST_ASSERT_UINT32_WITHIN(TEST_ONE_MS_US, TEST_HALF_SEC_US, us_ticker_read() - start);
}

Expand Down
4 changes: 3 additions & 1 deletion TESTS/mbedmicro-rtos-mbed/threads/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,13 @@ void self_terminate(Thread *self) {
// Tests that spawn tasks in different configurations
template <void (*F)(counter_t *)>
void test_single_thread() {
const char tname[] = "Single Thread";
counter_t counter(0);
Thread thread(osPriorityNormal, THREAD_STACK_SIZE, NULL);
Thread thread(osPriorityNormal, THREAD_STACK_SIZE, NULL, tname);
thread.start(callback(F, &counter));
thread.join();
TEST_ASSERT_EQUAL(counter, 1);
TEST_ASSERT_EQUAL(strcmp(tname, thread.get_name()), 0);
}

template <int N, void (*F)(counter_t *)>
Expand Down
Loading