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

sys/shell/commands/sc_gnrc_icmpv6_echo: use ztimer

Browse Source
This commit is contained in:
Marian Buschsieweke 2022-07-21 09:29:03 +02:00
parent 3a5e3636bb
commit cab761ba5d
No known key found for this signature in database
GPG Key ID: CB8E3238CE715A94
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/Makefile.dep
View File

@ -315,7 +315,7 @@ ifneq (,$(filter shell_commands,$(USEMODULE)))
endif endif
ifneq (,$(filter gnrc_icmpv6_echo,$(USEMODULE))) ifneq (,$(filter gnrc_icmpv6_echo,$(USEMODULE)))
USEMODULE += netutils xtimer USEMODULE += netutils ztimer_usec
endif endif
ifneq (,$(gnrc_udp_cmd,$(USEMODULE))) ifneq (,$(gnrc_udp_cmd,$(USEMODULE)))

2
sys/shell/commands/Makefile
View File

@ -63,10 +63,8 @@ ifneq (,$(filter gnrc_ipv6_blacklist,$(USEMODULE)))
SRC += sc_blacklist.c SRC += sc_blacklist.c
endif endif
ifneq (,$(filter gnrc_icmpv6_echo,$(USEMODULE))) ifneq (,$(filter gnrc_icmpv6_echo,$(USEMODULE)))
ifneq (,$(filter xtimer,$(USEMODULE)))
SRC += sc_gnrc_icmpv6_echo.c SRC += sc_gnrc_icmpv6_echo.c
endif endif
endif
ifneq (,$(filter gnrc_pktbuf_cmd,$(USEMODULE))) ifneq (,$(filter gnrc_pktbuf_cmd,$(USEMODULE)))
SRC += sc_gnrc_pktbuf.c SRC += sc_gnrc_pktbuf.c
endif endif

14
sys/shell/commands/sc_gnrc_icmpv6_echo.c
View File

@ -38,7 +38,7 @@
#include "timex.h" #include "timex.h"
#include "unaligned.h" #include "unaligned.h"
#include "utlist.h" #include "utlist.h"
#include "xtimer.h" #include "ztimer.h"
#ifdef MODULE_LUID #ifdef MODULE_LUID
#include "luid.h" #include "luid.h"
@ -60,7 +60,7 @@
typedef struct { typedef struct {
gnrc_netreg_entry_t netreg; gnrc_netreg_entry_t netreg;
xtimer_t sched_timer; ztimer_t sched_timer;
msg_t sched_msg; msg_t sched_msg;
ipv6_addr_t host; ipv6_addr_t host;
char *hostname; char *hostname;
@ -110,7 +110,7 @@ static int _gnrc_icmpv6_ping(int argc, char **argv)
msg_receive(&msg); msg_receive(&msg);
switch (msg.type) { switch (msg.type) {
case GNRC_NETAPI_MSG_TYPE_RCV: { case GNRC_NETAPI_MSG_TYPE_RCV: {
_handle_reply(&data, msg.content.ptr, xtimer_now_usec()); _handle_reply(&data, msg.content.ptr, ztimer_now(ZTIMER_USEC));
gnrc_pktbuf_release(msg.content.ptr); gnrc_pktbuf_release(msg.content.ptr);
break; break;
} }
@ -126,7 +126,7 @@ static int _gnrc_icmpv6_ping(int argc, char **argv)
} }
} while (data.num_recv < data.count); } while (data.num_recv < data.count);
finish: finish:
xtimer_remove(&data.sched_timer); ztimer_remove(ZTIMER_USEC, &data.sched_timer);
res = _finish(&data); res = _finish(&data);
gnrc_netreg_unregister(GNRC_NETTYPE_ICMPV6, &data.netreg); gnrc_netreg_unregister(GNRC_NETTYPE_ICMPV6, &data.netreg);
while (msg_avail() > 0) { while (msg_avail() > 0) {
@ -232,7 +232,7 @@ static int _configure(int argc, char **argv, _ping_data_t *data)
if (res != 0) { if (res != 0) {
_usage(cmdname); _usage(cmdname);
} }
data->id ^= (xtimer_now_usec() & UINT16_MAX); data->id ^= (ztimer_now(ZTIMER_USEC) & UINT16_MAX);
#ifdef MODULE_LUID #ifdef MODULE_LUID
luid_custom(&data->id, sizeof(data->id), data->id); luid_custom(&data->id, sizeof(data->id), data->id);
#endif #endif
@ -244,7 +244,7 @@ static void _fill_payload(uint8_t *buf, size_t len)
uint8_t i = 0; uint8_t i = 0;
if (len >= sizeof(uint32_t)) { if (len >= sizeof(uint32_t)) {
uint32_t now = xtimer_now_usec(); uint32_t now = ztimer_now(ZTIMER_USEC);
memcpy(buf, &now, sizeof(now)); memcpy(buf, &now, sizeof(now));
len -= sizeof(now); len -= sizeof(now);
buf += sizeof(now); buf += sizeof(now);
@ -305,7 +305,7 @@ static void _pinger(_ping_data_t *data)
} }
} }
} }
xtimer_set_msg(&data->sched_timer, timer, &data->sched_msg, ztimer_set_msg(ZTIMER_USEC, &data->sched_timer, timer, &data->sched_msg,
thread_getpid()); thread_getpid());
bf_unset(data->cktab, (size_t)data->num_sent % CKTAB_SIZE); bf_unset(data->cktab, (size_t)data->num_sent % CKTAB_SIZE);
pkt = gnrc_icmpv6_echo_build(ICMPV6_ECHO_REQ, data->id, pkt = gnrc_icmpv6_echo_build(ICMPV6_ECHO_REQ, data->id,