kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00
Code Releases Activity

ieee802154/submac: drop us param from ieee802154_submac_ack_timer_set()

Browse Source
This commit is contained in:
Benjamin Valentin 2023-05-25 11:53:51 +02:00
parent 3b7de34be2
commit 7b21b66fac
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/netdev_ieee802154_submac/netdev_ieee802154_submac.c
View File

@ -135,13 +135,13 @@ void ieee802154_submac_bh_request(ieee802154_submac_t *submac)
netdev->event_callback(netdev, NETDEV_EVENT_ISR);
}
void ieee802154_submac_ack_timer_set(ieee802154_submac_t *submac, uint16_t us)
void ieee802154_submac_ack_timer_set(ieee802154_submac_t *submac)
{
netdev_ieee802154_submac_t *netdev_submac = container_of(submac,
netdev_ieee802154_submac_t,
submac);
ztimer_set(ZTIMER_USEC, &netdev_submac->ack_timer, us);
ztimer_set(ZTIMER_USEC, &netdev_submac->ack_timer, submac->ack_timeout_us);
}
void ieee802154_submac_ack_timer_cancel(ieee802154_submac_t *submac)

4
sys/include/net/ieee802154/submac.h
View File

@ -503,10 +503,8 @@ int ieee802154_submac_init(ieee802154_submac_t *submac, const network_uint16_t *
* @note This function should be implemented by the user of the SubMAC.
*
* @param[in] submac pointer to the SubMAC descriptor
* @param[in] us microseconds until the ACK timeout timer is fired
*/
extern void ieee802154_submac_ack_timer_set(ieee802154_submac_t *submac,
uint16_t us);
extern void ieee802154_submac_ack_timer_set(ieee802154_submac_t *submac);
/**
* @brief Cancel the ACK timeout timer

2
sys/net/link_layer/ieee802154/submac.c
View File

@ -282,7 +282,7 @@ static ieee802154_fsm_state_t _fsm_state_tx_process_tx_done(ieee802154_submac_t
assert (res >= 0);
/* Handle ACK reception */
ieee802154_submac_ack_timer_set(submac, submac->ack_timeout_us);
ieee802154_submac_ack_timer_set(submac);
return IEEE802154_FSM_STATE_WAIT_FOR_ACK;
}
break;

5
tests/net/ieee802154_submac/main.c
View File

@ -128,10 +128,9 @@ static void _ev_ack_timeout_handler(event_t *event)
mutex_unlock(&lock);
}
void ieee802154_submac_ack_timer_set(ieee802154_submac_t *submac, uint16_t us)
void ieee802154_submac_ack_timer_set(ieee802154_submac_t *submac)
{
(void)submac;
ztimer_set(ZTIMER_USEC, &ack_timer, us);
ztimer_set(ZTIMER_USEC, &ack_timer, submac->ack_timeout_us);
}
void ieee802154_submac_ack_timer_cancel(ieee802154_submac_t *submac)