From 1865080a0759b318a6bd9141aa7695de943736d5 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 17 Feb 2021 22:20:47 -0500 Subject: msgblock: Move message manipulation code from serialqueue.c to new msgblock.c Signed-off-by: Kevin O'Connor --- klippy/chelper/serialqueue.h | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'klippy/chelper/serialqueue.h') diff --git a/klippy/chelper/serialqueue.h b/klippy/chelper/serialqueue.h index 62af9aaf..17e14316 100644 --- a/klippy/chelper/serialqueue.h +++ b/klippy/chelper/serialqueue.h @@ -2,43 +2,11 @@ #define SERIALQUEUE_H #include "list.h" // struct list_head +#include "msgblock.h" // MESSAGE_MAX #define MAX_CLOCK 0x7fffffffffffffffLL #define BACKGROUND_PRIORITY_CLOCK 0x7fffffff00000000LL -#define MESSAGE_MIN 5 -#define MESSAGE_MAX 64 -#define MESSAGE_HEADER_SIZE 2 -#define MESSAGE_TRAILER_SIZE 3 -#define MESSAGE_POS_LEN 0 -#define MESSAGE_POS_SEQ 1 -#define MESSAGE_TRAILER_CRC 3 -#define MESSAGE_TRAILER_SYNC 1 -#define MESSAGE_PAYLOAD_MAX (MESSAGE_MAX - MESSAGE_MIN) -#define MESSAGE_SEQ_MASK 0x0f -#define MESSAGE_DEST 0x10 -#define MESSAGE_SYNC 0x7E - -struct queue_message { - int len; - uint8_t msg[MESSAGE_MAX]; - union { - // Filled when on a command queue - struct { - uint64_t min_clock, req_clock; - }; - // Filled when in sent/receive queues - struct { - double sent_time, receive_time; - }; - }; - uint64_t notify_id; - struct list_node node; -}; - -struct queue_message *message_alloc_and_encode(uint32_t *data, int len); -void message_queue_free(struct list_head *root); - struct pull_queue_message { uint8_t msg[MESSAGE_MAX]; int len; -- cgit v1.2.3-70-g09d2