3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serialqueue: Simplify sequence number upconversion 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2023-12-04 14:00:47 -05:00
parent 99d7af87fd
commit 62bf52bfcf
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
klippy/chelper/serialqueue.c
View File

@ -222,12 +222,11 @@ handle_message(struct serialqueue *sq, double eventtime, int len)
pthread_mutex_lock(&sq->lock); pthread_mutex_lock(&sq->lock);
// Calculate receive sequence number // Calculate receive sequence number
uint64_t rseq = ((sq->receive_seq & ~MESSAGE_SEQ_MASK) uint32_t rseq_delta = ((sq->input_buf[MESSAGE_POS_SEQ] - sq->receive_seq)
| (sq->input_buf[MESSAGE_POS_SEQ] & MESSAGE_SEQ_MASK)); & MESSAGE_SEQ_MASK);
uint64_t rseq = sq->receive_seq + rseq_delta;
if (rseq != sq->receive_seq) { if (rseq != sq->receive_seq) {
// New sequence number // New sequence number
if (rseq < sq->receive_seq)
rseq += MESSAGE_SEQ_MASK+1;
if (rseq > sq->send_seq && sq->receive_seq != 1) { if (rseq > sq->send_seq && sq->receive_seq != 1) {
// An ack for a message not sent? Out of order message? // An ack for a message not sent? Out of order message?
sq->bytes_invalid += len; sq->bytes_invalid += len;