diff options
| author | Julian Oes <julian@oes.ch> | 2014-07-07 14:49:58 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-07-07 14:49:58 +0200 |
| commit | 79cbf15d2621db38688939ab70eda7ac2fb88cbe (patch) | |
| tree | 91b0843a5c761a5f46a75b64ffae0b78b1414750 /src/modules/systemlib | |
| parent | 57f707af56be0d9281a95aebf64baf63ef022267 (diff) | |
| parent | 509180abf6ff9e6a291e34bfb7dbdd105454feb5 (diff) | |
| download | px4-firmware-79cbf15d2621db38688939ab70eda7ac2fb88cbe.tar.gz px4-firmware-79cbf15d2621db38688939ab70eda7ac2fb88cbe.tar.bz2 px4-firmware-79cbf15d2621db38688939ab70eda7ac2fb88cbe.zip | |
Merge branch 'master' into offboard2_merge
Conflicts:
src/modules/commander/commander.cpp
Diffstat (limited to 'src/modules/systemlib')
| -rw-r--r-- | src/modules/systemlib/cpuload.c | 2 | ||||
| -rw-r--r-- | src/modules/systemlib/systemlib.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/systemlib/cpuload.c b/src/modules/systemlib/cpuload.c index ccc516f39..7aa2f3a5f 100644 --- a/src/modules/systemlib/cpuload.c +++ b/src/modules/systemlib/cpuload.c @@ -67,7 +67,7 @@ __EXPORT void sched_note_switch(FAR struct tcb_s *pFromTcb, FAR struct tcb_s *pT __EXPORT struct system_load_s system_load; -extern FAR struct _TCB *sched_gettcb(pid_t pid); +extern FAR struct tcb_s *sched_gettcb(pid_t pid); void cpuload_initialize_once() { diff --git a/src/modules/systemlib/systemlib.c b/src/modules/systemlib/systemlib.c index 9fff3eb88..90d8dd77c 100644 --- a/src/modules/systemlib/systemlib.c +++ b/src/modules/systemlib/systemlib.c @@ -54,6 +54,9 @@ #include "systemlib.h" +// Didn't seem right to include up_internal.h, so direct extern instead. +extern void up_systemreset(void) noreturn_function; + void systemreset(bool to_bootloader) { |