Manually integrated Jim's changes from integrate2_jim branch

Signed-off-by: Jim Wilson <jywilson99@hotmail.com>
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2016-02-19 16:59:46 +01:00
committed by Julian Oes
parent a1a615b907
commit caa94d58a6
14 changed files with 117 additions and 74 deletions
+8 -6
View File
@@ -87,7 +87,7 @@ static void hrt_unlock(void)
px4_sem_post(&_hrt_lock);
}
#if (defined(__APPLE__) && defined(__MACH__)) || defined(__PX4_QURT)
#if (defined(__APPLE__) && defined(__MACH__))
#include <time.h>
#include <sys/time.h>
#define CLOCK_REALTIME 0
@@ -111,12 +111,14 @@ int px4_clock_gettime(clockid_t clk_id, struct timespec *tp)
return 0;
}
int px4_clock_settime(clockid_t clk_id, struct timespec *tp)
{
/* do nothing right now */
return 0;
}
#elif defined(__QURT)
#include "dspal_time.h"
int px4_clock_gettime(clockid_t clk_id, struct timespec *tp)
{
return clock_gettime(clk_id, tp);
}
#endif
/*