kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 18:13:49 +01:00
Code Releases Activity

Merge pull request #21633 from crasbe/pr/sntp

Browse Source 
sys/net/sntp: migrate from xtimer to ztimer
This commit is contained in:
Marian Buschsieweke 2025-08-21 16:23:56 +00:00 committed by GitHub
commit c0cc617c7f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/Makefile.dep
View File

@ -134,11 +134,8 @@ endif
ifneq (,$(filter sntp,$(USEMODULE))) ifneq (,$(filter sntp,$(USEMODULE)))
USEMODULE += sock_udp USEMODULE += sock_udp
USEMODULE += xtimer USEMODULE += ztimer64
ifneq (,$(filter ztimer_xtimer_compat,$(USEMODULE))) USEMODULE += ztimer64_usec
# requires 64bit ftimestamps
USEMODULE += ztimer64_xtimer_compat
endif
endif endif
ifneq (,$(filter sock_%,$(USEMODULE))) ifneq (,$(filter sock_%,$(USEMODULE)))

4
sys/include/net/ntp_packet.h
View File

@ -14,6 +14,8 @@
* @brief The NTP packet module provides functionality to manipulate the NTP header * @brief The NTP packet module provides functionality to manipulate the NTP header
* @{ * @{
* *
* @see An implementation of Simple NTP can be found in @ref net_sntp.
*
* @file * @file
* @brief NTP packet definitions * @brief NTP packet definitions
* *
@ -46,7 +48,7 @@ extern "C" {
#define NTP_PORT (123U) /**< NTP port number */ #define NTP_PORT (123U) /**< NTP port number */
/** /**
* @brief Offset in seconds of NTP timestamp (seconds from 1990-01-01 00:00:00 UTC) * @brief Offset in seconds of NTP timestamp (seconds from 1900-01-01 00:00:00 UTC)
* to UNIX timestamp (seconds from 1970-01-01 00:00:00 UTC). * to UNIX timestamp (seconds from 1970-01-01 00:00:00 UTC).
*/ */
#define NTP_UNIX_OFFSET (2208988800) #define NTP_UNIX_OFFSET (2208988800)

11
sys/include/net/sntp.h
View File

@ -15,6 +15,10 @@
* @brief Simple Network Time Protocol (SNTP) implementation * @brief Simple Network Time Protocol (SNTP) implementation
* @{ * @{
* *
* @note The current implementation of SNTP uses @ref sys_ztimer64 with
* microsecond accuracy, which can have a strong impact on
* the power consumption of your device.
*
* @file * @file
* @brief SNTP definitions * @brief SNTP definitions
* *
@ -27,7 +31,7 @@
#include "net/ntp_packet.h" #include "net/ntp_packet.h"
#include "net/sock/udp.h" #include "net/sock/udp.h"
#include "xtimer.h" #include "ztimer64.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -45,7 +49,7 @@ extern "C" {
int sntp_sync(sock_udp_ep_t *server, uint32_t timeout); int sntp_sync(sock_udp_ep_t *server, uint32_t timeout);
/** /**
* @brief Get real time offset from system time as returned by @ref xtimer_now64() * @brief Get real time offset from system time as returned by @ref ztimer64_now()
* *
* @return Real time offset in microseconds relative to 1900-01-01 00:00 UTC * @return Real time offset in microseconds relative to 1900-01-01 00:00 UTC
*/ */
@ -58,7 +62,8 @@ int64_t sntp_get_offset(void);
*/ */
static inline uint64_t sntp_get_unix_usec(void) static inline uint64_t sntp_get_unix_usec(void)
{ {
return (uint64_t)(sntp_get_offset() - (NTP_UNIX_OFFSET * US_PER_SEC) + xtimer_now_usec64()); return (uint64_t)(sntp_get_offset() - (NTP_UNIX_OFFSET * US_PER_SEC) + \
ztimer64_now(ZTIMER64_USEC));
} }
#ifdef __cplusplus #ifdef __cplusplus

4
sys/net/application_layer/sntp/sntp.c
View File

@ -22,7 +22,7 @@
#include "net/sntp.h" #include "net/sntp.h"
#include "net/ntp_packet.h" #include "net/ntp_packet.h"
#include "net/sock/udp.h" #include "net/sock/udp.h"
#include "xtimer.h" #include "ztimer64.h"
#include "mutex.h" #include "mutex.h"
#include "byteorder.h" #include "byteorder.h"
@ -70,7 +70,7 @@ int sntp_sync(sock_udp_ep_t *server, uint32_t timeout)
mutex_lock(&_sntp_mutex); mutex_lock(&_sntp_mutex);
_sntp_offset = (((int64_t)byteorder_ntohl(_sntp_packet.transmit.seconds)) * US_PER_SEC) + _sntp_offset = (((int64_t)byteorder_ntohl(_sntp_packet.transmit.seconds)) * US_PER_SEC) +
((((int64_t)byteorder_ntohl(_sntp_packet.transmit.fraction)) * 232) ((((int64_t)byteorder_ntohl(_sntp_packet.transmit.fraction)) * 232)
/ 1000000) - xtimer_now_usec64(); / 1000000) - ztimer64_now(ZTIMER64_USEC);
mutex_unlock(&_sntp_mutex); mutex_unlock(&_sntp_mutex);
return 0; return 0;
} }