}
}
-static inline struct msg_info *frame2info(struct can_frame *frame)
+static inline uint16_t frame_index(struct can_frame *frame)
{
uint16_t idx;
if (frame->can_dlc >= 2) {
error(1, 0, "%s error", __FUNCTION__);
}
- return &msg_infos[idx];
+ return idx;
+}
+
+static inline struct msg_info *frame2info(struct can_frame *frame)
+{
+ return &msg_infos[frame_index(frame)];
}
static inline char *tstamp_str(const void *ctx, struct timespec *tstamp)
}
pfd[0].revents = 0;
- if (num_interfaces == 3 && pfd[1].revents != 0) {
+ if (num_interfaces == 3 && pfd[1].revents & POLLIN) {
process_on_wire_rx(pfd[1].fd);
pfd[1].revents = 0;
}
+ if (num_interfaces == 3 && pfd[1].revents & ~POLLIN)
+ error(1, 0, "Unexpected pfd[1].revents: 0x%04x\n", pfd[1].revents);
i = (num_interfaces == 2) ? 1 : 2;
- if (pfd[i].revents != 0) {
+ if (pfd[i].revents & POLLIN) {
consecutive_timeouts = 0;
process_final_rx(pfd[i].fd);
msg_in_progress--;
SEND();
}
}
+ if (pfd[i].revents & ~POLLIN)
+ error(1, 0, "Unexpected pfd[%d].revents: 0x%04x\n", pfd[i].revents);
}
}