michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sys: util: Replace MIN(MAX(a, b), c) with CLAMP

Browse source 
Replaces all existing variants of value clamping with the MIN and MAX
macros with the CLAMP macro.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
This commit is contained in:
Trond Einar Snekvik 2020-10-27 12:27:25 +01:00 • committed by Carles Cufí
commit 86c793af3f
16 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/controller/ll_sw/ull_conn.c
View file

@ -3235,9 +3235,9 @@ static inline void dle_max_time_get(const struct ll_conn *conn,
(!feature_coded_phy && !feature_phy_2m)) {
rx_time = PKT_US(LL_LENGTH_OCTETS_RX_MAX, PHY_1M);
#if defined(CONFIG_BT_CTLR_PHY)
tx_time = MAX(MIN(PKT_US(LL_LENGTH_OCTETS_RX_MAX, PHY_1M),
conn->default_tx_time),
PKT_US(PDU_DC_PAYLOAD_SIZE_MIN, PHY_1M));
tx_time = CLAMP(conn->default_tx_time,
PKT_US(PDU_DC_PAYLOAD_SIZE_MIN, PHY_1M),
PKT_US(LL_LENGTH_OCTETS_RX_MAX, PHY_1M));
#else /* !CONFIG_BT_CTLR_PHY */
tx_time = PKT_US(conn->default_tx_octets, PHY_1M);
#endif /* !CONFIG_BT_CTLR_PHY */