Skip to content

W
White Rabbit Trigger Distribution
Commit 1af65f24 authored by Dimitris Lampridis's avatar Dimitris Lampridis
Browse files
Options

Merge branch '16-remove-unused-event-and-message-flags' into 'master' 

Resolve "Remove unused event and message flags"

Closes #16

See merge request be-cem-edl/chronos/wrtd!11
parents 8342ccb0 a1a8ce9c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
software/firmware/include/wrtd-rt-common.h
View file @ 1af65f24
...@@ -381,7 +381,6 @@ static inline void zero_event(struct wrtd_event *ev) ...@@ -381,7 +381,6 @@ static inline void zero_event(struct wrtd_event *ev)
zero_id(&ev->id); zero_id(&ev->id);
ev->seq = 0; ev->seq = 0;
ev->flags = 0;
} }
static inline void copy_tstamp(struct wrtd_tstamp *dest, static inline void copy_tstamp(struct wrtd_tstamp *dest,
...@@ -399,7 +398,6 @@ static inline void copy_event(struct wrtd_event *dest, ...@@ -399,7 +398,6 @@ static inline void copy_event(struct wrtd_event *dest,
copy_tstamp(&dest->ts, &src->ts); copy_tstamp(&dest->ts, &src->ts);
copy_id(&dest->id, &src->id); copy_id(&dest->id, &src->id);
dest->seq = src->seq; dest->seq = src->seq;
dest->flags = src->flags;
} }
/* Returns true iff L is the same id as R. */ /* Returns true iff L is the same id as R. */
...@@ -513,7 +511,7 @@ static int wrtd_send_network(struct wrtd_event *ev) ...@@ -513,7 +511,7 @@ static int wrtd_send_network(struct wrtd_event *ev)
msg->ts_ns = ev->ts.ns; msg->ts_ns = ev->ts.ns;
msg->ts_frac = ev->ts.frac >> 16; msg->ts_frac = ev->ts.frac >> 16;
msg->ts_hi_sec = 0; msg->ts_hi_sec = 0;
msg->flags = 0; msg->reserved = 0;
msg->zero[0] = 0; msg->zero[0] = 0;
msg->zero[1] = 0; msg->zero[1] = 0;
msg->pad[0] = 0; msg->pad[0] = 0;
...@@ -736,8 +734,6 @@ static void wrtd_recv_network(void) ...@@ -736,8 +734,6 @@ static void wrtd_recv_network(void)
copy_id(&ev.id, (union wrtd_id*)&msg->event_id); copy_id(&ev.id, (union wrtd_id*)&msg->event_id);
ev.flags = msg->flags;
mq_discard(TRTL_RMQ, WRTD_RMQ); mq_discard(TRTL_RMQ, WRTD_RMQ);
wrtd_log(WRTD_LOG_MSG_EV_NETWORK, WRTD_LOG_NETWORK_RX, &ev, NULL); wrtd_log(WRTD_LOG_MSG_EV_NETWORK, WRTD_LOG_NETWORK_RX, &ev, NULL);
......
software/include/wrtd-common.h
View file @ 1af65f24
...@@ -55,9 +55,6 @@ struct wrtd_event { ...@@ -55,9 +55,6 @@ struct wrtd_event {
/** Sequence number. */ /** Sequence number. */
uint32_t seq; uint32_t seq;
/** Associated flags. */
unsigned char flags;
}; };
inline static unsigned char wrtd_id_hash(union wrtd_id *id) inline static unsigned char wrtd_id_hash(union wrtd_id *id)
...@@ -149,7 +146,7 @@ struct wrtd_message { ...@@ -149,7 +146,7 @@ struct wrtd_message {
uint32_t ts_ns; uint32_t ts_ns;
uint16_t ts_frac; uint16_t ts_frac;
uint16_t ts_hi_sec; uint16_t ts_hi_sec;
uint8_t flags; uint8_t reserved;
uint8_t zero[2]; uint8_t zero[2];
uint8_t pad[1]; uint8_t pad[1];
}; };
......
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