@@ -412,7 +412,7 @@ CANARD_PRIVATE int32_t txPushSingleFrame(struct CanardTxQueue* const que,
412412 // Insert the newly created TX item into the deadline queue.
413413 const struct CanardTreeNode * const deadline_queue_res = cavl2_find_or_insert (& que -> priority_root ,
414414 & tqi -> deadline_base ,
415- & txAVLPriorityPredicate ,
415+ & txAVLDeadlinePredicate ,
416416 tqi ,
417417 & avlTrivialFactory );
418418 (void ) deadline_queue_res ;
@@ -642,7 +642,7 @@ CANARD_PRIVATE size_t txFlushExpiredTransfers(struct CanardTxQueue* const
642642 CANARD_ASSERT (now_usec > 0 );
643643
644644 size_t count = 0 ;
645- struct CanardTreeNode * tx_node = cavl2_extremum (que -> deadline_root , false );
645+ struct CanardTreeNode * tx_node = cavl2_min (que -> deadline_root );
646646 struct CanardTxQueueItem * tx_item = MUTABLE_CONTAINER_OF (struct CanardTxQueueItem , tx_node , deadline_base );
647647 while (NULL != tx_item )
648648 {
@@ -652,7 +652,7 @@ CANARD_PRIVATE size_t txFlushExpiredTransfers(struct CanardTxQueue* const
652652 }
653653 count += txPopAndFreeTransfer (que , ins , tx_item , true); // drop the whole transfer
654654
655- tx_node = cavl2_extremum (que -> deadline_root , false );
655+ tx_node = cavl2_min (que -> deadline_root );
656656 tx_item = MUTABLE_CONTAINER_OF (struct CanardTxQueueItem , tx_node , deadline_base );
657657 }
658658 return count ;
@@ -1242,7 +1242,7 @@ struct CanardTxQueueItem* canardTxPeek(const struct CanardTxQueue* const que)
12421242 struct CanardTxQueueItem * out = NULL ;
12431243 if (que != NULL )
12441244 {
1245- struct CanardTreeNode * const priority_node = cavl2_extremum (que -> priority_root , false );
1245+ struct CanardTreeNode * const priority_node = cavl2_min (que -> priority_root );
12461246 out = MUTABLE_CONTAINER_OF (struct CanardTxQueueItem , priority_node , priority_base );
12471247 }
12481248 return out ;
@@ -1358,7 +1358,7 @@ int8_t canardRxAccept(struct CanardInstance* const ins,
13581358 & model .port_id ,
13591359 & rxSubscriptionPredicateOnPortID ,
13601360 ins ,
1361- & avlTrivialFactory );
1361+ NULL );
13621362 struct CanardRxSubscription * const sub =
13631363 MUTABLE_CONTAINER_OF (struct CanardRxSubscription , sub_node , base );
13641364 if (out_subscription != NULL )
@@ -1420,7 +1420,7 @@ int8_t canardRxSubscribe(struct CanardInstance* const ins,
14201420 & out_subscription -> base ,
14211421 & rxSubscriptionPredicateOnStruct ,
14221422 out_subscription ,
1423- avlTrivialFactory );
1423+ & avlTrivialFactory );
14241424 (void ) res ;
14251425 CANARD_ASSERT (res == & out_subscription -> base );
14261426 out = (out > 0 ) ? 0 : 1 ;
0 commit comments