Commit 05616c51 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Daniel DeGrasse
Browse files

posix: fix posix clock undefined type 



When built with the minimal libc while using POSIX clocks, Zephyr
compilation breaks with "error: unknown type name 'clockid_t'." Use
int instead of clockid_t to eliminate the dependency.

Suggested-by: default avatarChris Friedt <cfriedt@tenstorrent.com>
Signed-off-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
parent 99b988b8

lib/posix/options/posix_clock.h

+2 −4
Original line number Diff line number Diff line
@@ -9,13 +9,11 @@ 
#define ZEPHYR_LIB_POSIX_POSIX_CLOCK_H_



#include <stdbool.h>

#include <stddef.h>

#include <stdint.h>

#include <time.h>



#include <zephyr/sys_clock.h>

#include <zephyr/sys/__assert.h>

#include <zephyr/posix/sys/time.h>

#include <zephyr/sys/clock.h>

#include <zephyr/sys/timeutil.h>



#ifdef __cplusplus
@@ -59,7 +57,7 @@ static inline bool tp_diff_in_range_ns(const struct timespec *a, const struct ti 
	return diff >= lo && diff < hi;

}



uint32_t timespec_to_timeoutms(clockid_t clock_id, const struct timespec *abstime);

uint32_t timespec_to_timeoutms(int clock_id, const struct timespec *abstime);



/** INTERNAL_HIDDEN @endcond */

lib/posix/options/timespec_to_timeout.c

+4 −3
Original line number Diff line number Diff line
@@ -8,15 +8,16 @@ 


#include <limits.h>

#include <stdint.h>

#include <time.h>



#include <zephyr/posix/time.h>

#include <zephyr/sys/clock.h>

#include <zephyr/sys/util.h>



uint32_t timespec_to_timeoutms(clockid_t clock_id, const struct timespec *abstime)

uint32_t timespec_to_timeoutms(int clock_id, const struct timespec *abstime)

{

	struct timespec curtime;



	if (clock_gettime(clock_id, &curtime) < 0) {

	if (sys_clock_gettime(clock_id, &curtime) < 0) {

		return 0;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE