cleanup

Author: pavel-kirienko

libcanard/canard.c

@@ -448,7 +448,7 @@ static tx_frame_t* tx_frame_new(canard_t* const self, const size_t data_size)
     if (frame != NULL) {
         frame->next     = NULL;
         frame->refcount = 1U;
-        frame->dlc      = canard_len_to_dlc[data_size]; // NOLINT(*-security.ArrayBound)
+        frame->dlc      = canard_len_to_dlc[data_size] & 15U; // NOLINT(*-security.ArrayBound)
         // Update the count; this is decremented when the frame is freed upon refcount reaching zero.
         self->tx.queue_size++;
     }
@@ -968,7 +968,7 @@ static bool tx_push(canard_t* const            self,
     CANARD_ASSERT((self->tx.queue_size - queue_size_before) == n_frames);
     CANARD_ASSERT(self->tx.queue_size <= self->tx.queue_capacity);
     (void)queue_size_before;
-    const size_t frame_refcount_inc = popcount(tr->iface_bitmap) - 1U;
+    const byte_t frame_refcount_inc = (byte_t)(popcount(tr->iface_bitmap) - 1U);
     CANARD_ASSERT(frame_refcount_inc < CANARD_IFACE_COUNT);
     if (frame_refcount_inc > 0) {
         tx_frame_t* frame = spool;

libcanard/canard.h

@@ -144,8 +144,8 @@ typedef enum canard_prio_t
 #ifndef CANARD_TX_SHARDING_BITS
 #define CANARD_TX_SHARDING_BITS 4U
 #endif
-#if (CANARD_TX_SHARDING_BITS < 3) || (CANARD_TX_SHARDING_BITS > 16)
-#error "CANARD_TX_SHARDING_BITS must be in the range [3, 16]"
+#if (CANARD_TX_SHARDING_BITS < 3)
+#error "CANARD_TX_SHARDING_BITS must be at least 3"
 #endif
 #define CANARD_TX_SHARDS (1U << CANARD_TX_SHARDING_BITS)
 
@@ -411,7 +411,7 @@ struct canard_t
         ///
         /// Unlike Cyphal/UDP, we don't have a dedicated deadline index, again to conserve memory. Instead, we do
         /// iterative scanning during poll() by storing the iteration cursors here. They are invalidated as needed.
-        uint16_t      pending_shards_bitmap[CANARD_IFACE_COUNT]; ///< Bit index corresponds to non-empty pending shards.
+        uint32_t      pending_shards_bitmap[CANARD_IFACE_COUNT]; ///< Bit index corresponds to non-empty pending shards.
         canard_list_t pending[CANARD_TX_SHARDS][CANARD_IFACE_COUNT]; ///< Next to transmit at the head.
         canard_list_t delayed[CANARD_TX_SHARDS]; ///< Soonest retry time at the head. HEAT_DEATH if backlogged, at tail.
         canard_list_t oldest[2];                 ///< ALL transfers, oldest at head, sharded by QoS (1=reliable).