Skip to content

P
PPSi
Commit d7c142a7 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

time-wrpc: exclude WRPC_FAULTS specific code when not used 

Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent bcc1fdae
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 5 deletions
include/ppsi/ppsi.h
View file @ d7c142a7
...@@ -27,6 +27,12 @@ ...@@ -27,6 +27,12 @@
#undef ARRAY_SIZE #undef ARRAY_SIZE
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#ifdef CONFIG_WRPC_FAULTS
# define CONFIG_HAS_WRPC_FAULTS 1
#else
# define CONFIG_HAS_WRPC_FAULTS 0
#endif
/* We can't include pp-printf.h when building freestading, so have it here */ /* We can't include pp-printf.h when building freestading, so have it here */
extern int pp_printf(const char *fmt, ...) extern int pp_printf(const char *fmt, ...)
__attribute__((format(printf, 1, 2))); __attribute__((format(printf, 1, 2)));
......
time-wrpc/wrpc-socket.c
View file @ d7c142a7
...@@ -78,11 +78,13 @@ static int wrpc_net_recv(struct pp_instance *ppi, void *pkt, int len, ...@@ -78,11 +78,13 @@ static int wrpc_net_recv(struct pp_instance *ppi, void *pkt, int len,
dump_payloadpkt("recv: ", pkt, got, t); dump_payloadpkt("recv: ", pkt, got, t);
#endif #endif
if (ppsi_drop_rx()) { if (CONFIG_HAS_WRPC_FAULTS && ppsi_drop_rx()) {
pp_diag(ppi, frames, 1, "Drop received frame\n"); pp_diag(ppi, frames, 1, "Drop received frame\n");
return -2; return -2;
} }
usleep(frame_rx_delay_us);
if (CONFIG_HAS_WRPC_FAULTS)
usleep(frame_rx_delay_us);
return got; return got;
} }
...@@ -105,13 +107,14 @@ static int wrpc_net_send(struct pp_instance *ppi, void *pkt, int len, ...@@ -105,13 +107,14 @@ static int wrpc_net_send(struct pp_instance *ppi, void *pkt, int len,
* to transmit it for real, if we want to get back our * to transmit it for real, if we want to get back our
* hardware stamp. Thus, remember if we drop, and use this info. * hardware stamp. Thus, remember if we drop, and use this info.
*/ */
drop = ppsi_drop_tx(); if (CONFIG_HAS_WRPC_FAULTS)
drop = ppsi_drop_tx();
sock = ppi->ch[PP_NP_EVT].custom; sock = ppi->ch[PP_NP_EVT].custom;
addr.ethertype = htons(ETH_P_1588); addr.ethertype = htons(ETH_P_1588);
memcpy(&addr.mac, macaddr[is_pdelay], sizeof(mac_addr_t)); memcpy(&addr.mac, macaddr[is_pdelay], sizeof(mac_addr_t));
if (drop) { if (CONFIG_HAS_WRPC_FAULTS && drop) {
addr.ethertype = 1; addr.ethertype = 1;
addr.mac[0] = 0x22; /* pfilter uses mac; drop for nodes too */ addr.mac[0] = 0x22; /* pfilter uses mac; drop for nodes too */
} }
...@@ -128,7 +131,7 @@ static int wrpc_net_send(struct pp_instance *ppi, void *pkt, int len, ...@@ -128,7 +131,7 @@ static int wrpc_net_send(struct pp_instance *ppi, void *pkt, int len,
__func__, snt, (long)t->secs, __func__, snt, (long)t->secs,
(long)(t->scaled_nsecs >> 16)); (long)(t->scaled_nsecs >> 16));
} }
if (drop) { if (CONFIG_HAS_WRPC_FAULTS && drop) {
pp_diag(ppi, frames, 1, "Drop sent frame\n"); pp_diag(ppi, frames, 1, "Drop sent frame\n");
return -2; return -2;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment