nits

Author: pavel-kirienko

libudpard/udpard.c

@@ -824,7 +824,7 @@ static tx_frame_t* tx_spool(udpard_tx_t* const             tx,
 static udpard_us_t tx_ack_timeout(const udpard_us_t baseline, const udpard_prio_t prio, const size_t attempts)
 {
     UDPARD_ASSERT(baseline > 0);
-    UDPARD_ASSERT(prio <= UDPARD_PRIORITY_MAX);
+    UDPARD_ASSERT(prio < UDPARD_PRIORITY_COUNT);
     return baseline * (1LL << smaller((size_t)prio + attempts, 62)); // NOLINT(*-signed-bitwise)
 }
 
@@ -1145,7 +1145,7 @@ uint32_t udpard_tx_push(udpard_tx_t* const             self,
 {
     uint32_t   out = 0;
     const bool ok  = (self != NULL) && (deadline >= now) && (now >= 0) && (self->local_uid != 0) &&
-                    (valid_ep_mask(remote_ep) != 0) && (priority <= UDPARD_PRIORITY_MAX) &&
+                    (valid_ep_mask(remote_ep) != 0) && (priority < UDPARD_PRIORITY_COUNT) &&
                     ((payload.bytes.data != NULL) || (payload.bytes.size == 0U)) &&
                     (tx_transfer_find(self, topic_hash, transfer_id) == NULL);
     if (ok) {
@@ -1176,7 +1176,7 @@ uint32_t udpard_tx_push_p2p(udpard_tx_t* const             self,
 {
     uint32_t   out = 0;
     const bool ok  = (self != NULL) && (deadline >= now) && (now >= 0) && (self->local_uid != 0) &&
-                    (valid_ep_mask(remote.endpoints) != 0) && (priority <= UDPARD_PRIORITY_MAX) &&
+                    (valid_ep_mask(remote.endpoints) != 0) && (priority < UDPARD_PRIORITY_COUNT) &&
                     ((payload.bytes.data != NULL) || (payload.bytes.size == 0U));
     if (ok) {
         udpard_tx_poll(self, now, UDPARD_IFACE_MASK_ALL);

libudpard/udpard.h

@@ -61,8 +61,8 @@ extern "C"
 #define UDPARD_VERSION_MINOR 0
 
 /// The version number of the Cyphal specification implemented by this library.
-#define UDPARD_CYPHAL_SPECIFICATION_VERSION_MAJOR 1
-#define UDPARD_CYPHAL_SPECIFICATION_VERSION_MINOR 1
+#define UDPARD_CYPHAL_VERSION_MAJOR 1
+#define UDPARD_CYPHAL_VERSION_MINOR 1
 
 /// RFC 791 states that hosts must be prepared to accept datagrams of up to 576 octets and it is expected that this
 /// library will receive non IP-fragmented datagrams thus the minimum MTU should be larger than 576.
@@ -106,9 +106,6 @@ typedef int64_t udpard_us_t;
 /// In IPv6 networks, 32 bits are supported.
 #define UDPARD_IPv4_SUBJECT_ID_MAX 0x7FFFFFUL
 
-#define UDPARD_PRIORITY_MAX   7U
-#define UDPARD_PRIORITY_COUNT (UDPARD_PRIORITY_MAX + 1U)
-
 typedef enum udpard_prio_t
 {
     udpard_prio_exceptional = 0,
@@ -120,6 +117,7 @@ typedef enum udpard_prio_t
     udpard_prio_slow        = 6,
     udpard_prio_optional    = 7,
 } udpard_prio_t;
+#define UDPARD_PRIORITY_COUNT 8U
 
 typedef struct udpard_tree_t
 {

tests/src/helpers.h

@@ -17,7 +17,7 @@
 #error "Library version not defined"
 #endif
 
-#if !(defined(UDPARD_CYPHAL_SPECIFICATION_VERSION_MAJOR) && defined(UDPARD_CYPHAL_SPECIFICATION_VERSION_MINOR))
+#if !(defined(UDPARD_CYPHAL_VERSION_MAJOR) && defined(UDPARD_CYPHAL_VERSION_MINOR))
 #error "Cyphal specification version not defined"
 #endif