Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-29 03:36:07 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Inline ts_to_abstime and abstime_to_ts

Browse Source 
Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>
This commit is contained in:
Jukka Laitinen
2022-02-24 14:07:24 +02:00
committed by Beat Küng
parent 3e6a35fe8a
commit 9f049b4dca
7 changed files with 15 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/nuttx/src/px4/nxp/imxrt/hrt/hrt.c
-25
View File
@@ -561,31 +561,6 @@ hrt_absolute_time(void)
return abstime; return abstime;
} }
/**
* Convert a timespec to absolute time
*/
hrt_abstime
ts_to_abstime(const struct timespec *ts)
{
hrt_abstime result;
result = (hrt_abstime)(ts->tv_sec) * 1000000;
result += ts->tv_nsec / 1000;
return result;
}
/**
* Convert absolute time to a timespec.
*/
void
abstime_to_ts(struct timespec *ts, hrt_abstime abstime)
{
ts->tv_sec = abstime / 1000000;
abstime -= ts->tv_sec * 1000000;
ts->tv_nsec = abstime * 1000;
}
/** /**
* Store the absolute time in an interrupt-safe fashion * Store the absolute time in an interrupt-safe fashion
*/ */
platforms/nuttx/src/px4/nxp/kinetis/hrt/hrt.c
-25
View File
@@ -573,31 +573,6 @@ hrt_absolute_time(void)
return abstime; return abstime;
} }
/**
* Convert a timespec to absolute time
*/
hrt_abstime
ts_to_abstime(const struct timespec *ts)
{
hrt_abstime result;
result = (hrt_abstime)(ts->tv_sec) * 1000000;
result += ts->tv_nsec / 1000;
return result;
}
/**
* Convert absolute time to a timespec.
*/
void
abstime_to_ts(struct timespec *ts, hrt_abstime abstime)
{
ts->tv_sec = abstime / 1000000;
abstime -= ts->tv_sec * 1000000;
ts->tv_nsec = abstime * 1000;
}
/** /**
* Store the absolute time in an interrupt-safe fashion * Store the absolute time in an interrupt-safe fashion
*/ */
platforms/nuttx/src/px4/nxp/s32k1xx/hrt/hrt.c
-25
View File
@@ -609,31 +609,6 @@ hrt_absolute_time(void)
return abstime; return abstime;
} }
/**
* Convert a timespec to absolute time
*/
hrt_abstime
ts_to_abstime(const struct timespec *ts)
{
hrt_abstime result;
result = (hrt_abstime)(ts->tv_sec) * 1000000;
result += ts->tv_nsec / 1000;
return result;
}
/**
* Convert absolute time to a timespec.
*/
void
abstime_to_ts(struct timespec *ts, hrt_abstime abstime)
{
ts->tv_sec = abstime / 1000000;
abstime -= ts->tv_sec * 1000000;
ts->tv_nsec = abstime * 1000;
}
/** /**
* Store the absolute time in an interrupt-safe fashion * Store the absolute time in an interrupt-safe fashion
*/ */
platforms/nuttx/src/px4/rpi/rpi_common/hrt/hrt.c
-23
View File
@@ -497,29 +497,6 @@ hrt_abstime hrt_absolute_time(void)
return ((uint64_t) hi << 32) | lo; return ((uint64_t) hi << 32) | lo;
} }
/**
* Convert a timespec to absolute time
*/
hrt_abstime ts_to_abstime(const struct timespec *ts)
{
hrt_abstime result;
result = (hrt_abstime)(ts->tv_sec) * 1000000;
result += ts->tv_nsec / 1000;
return result;
}
/**
* Convert absolute time to a timespec.
*/
void abstime_to_ts(struct timespec *ts, hrt_abstime abstime)
{
ts->tv_sec = abstime / 1000000;
abstime -= ts->tv_sec * 1000000;
ts->tv_nsec = abstime * 1000;
}
/** /**
* Compare a time value with the current time as atomic operation * Compare a time value with the current time as atomic operation
*/ */
platforms/nuttx/src/px4/stm/stm32_common/hrt/hrt.c
-25
View File
@@ -694,31 +694,6 @@ hrt_absolute_time(void)
return abstime; return abstime;
} }
/**
* Convert a timespec to absolute time
*/
hrt_abstime
ts_to_abstime(const struct timespec *ts)
{
hrt_abstime result;
result = (hrt_abstime)(ts->tv_sec) * 1000000;
result += ts->tv_nsec / 1000;
return result;
}
/**
* Convert absolute time to a timespec.
*/
void
abstime_to_ts(struct timespec *ts, hrt_abstime abstime)
{
ts->tv_sec = abstime / 1000000;
abstime -= ts->tv_sec * 1000000;
ts->tv_nsec = abstime * 1000;
}
/** /**
* Store the absolute time in an interrupt-safe fashion * Store the absolute time in an interrupt-safe fashion
*/ */
platforms/posix/src/px4/common/drv_hrt.cpp
-20
View File
@@ -144,19 +144,6 @@ hrt_abstime hrt_absolute_time()
#endif // defined(ENABLE_LOCKSTEP_SCHEDULER) #endif // defined(ENABLE_LOCKSTEP_SCHEDULER)
} }
/*
* Convert a timespec to absolute time.
*/
hrt_abstime ts_to_abstime(const struct timespec *ts)
{
hrt_abstime result;
result = (hrt_abstime)(ts->tv_sec) * 1000000;
result += ts->tv_nsec / 1000;
return result;
}
/* /*
* Store the absolute time in an interrupt-safe fashion. * Store the absolute time in an interrupt-safe fashion.
* *
@@ -484,13 +471,6 @@ hrt_call_invoke()
hrt_unlock(); hrt_unlock();
} }
void abstime_to_ts(struct timespec *ts, hrt_abstime abstime)
{
ts->tv_sec = abstime / 1000000;
abstime -= ts->tv_sec * 1000000;
ts->tv_nsec = abstime * 1000;
}
int px4_clock_gettime(clockid_t clk_id, struct timespec *tp) int px4_clock_gettime(clockid_t clk_id, struct timespec *tp)
{ {
if (clk_id == CLOCK_MONOTONIC) { if (clk_id == CLOCK_MONOTONIC) {
src/drivers/drv_hrt.h
+15 -2
View File
@@ -97,12 +97,25 @@ __EXPORT extern hrt_abstime hrt_absolute_time(void);
/** /**
* Convert a timespec to absolute time. * Convert a timespec to absolute time.
*/ */
__EXPORT extern hrt_abstime ts_to_abstime(const struct timespec *ts); static inline hrt_abstime ts_to_abstime(const struct timespec *ts)
{
hrt_abstime result;
result = (hrt_abstime)(ts->tv_sec) * 1000000;
result += ts->tv_nsec / 1000;
return result;
}
/** /**
* Convert absolute time to a timespec. * Convert absolute time to a timespec.
*/ */
__EXPORT extern void abstime_to_ts(struct timespec *ts, hrt_abstime abstime); static inline void abstime_to_ts(struct timespec *ts, hrt_abstime abstime)
{
ts->tv_sec = abstime / 1000000;
abstime -= ts->tv_sec * 1000000;
ts->tv_nsec = abstime * 1000;
}
/** /**
* Compute the delta between a timestamp taken in the past * Compute the delta between a timestamp taken in the past