From 26bcaf94b5583a8a5dbde26858844644fbabb45d Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Dec 2020 13:40:24 +0100 Subject: [PATCH 1/6] drivers/at86rf2xx: use byteorder_htols() same as 374d032b821290074bae76a78b2bd1c896527d1a --- drivers/at86rf2xx/at86rf2xx_getset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/at86rf2xx/at86rf2xx_getset.c b/drivers/at86rf2xx/at86rf2xx_getset.c index eb128ea97b..91e491b541 100644 --- a/drivers/at86rf2xx/at86rf2xx_getset.c +++ b/drivers/at86rf2xx/at86rf2xx_getset.c @@ -221,7 +221,7 @@ uint16_t at86rf2xx_get_pan(const at86rf2xx_t *dev) void at86rf2xx_set_pan(at86rf2xx_t *dev, uint16_t pan) { - le_uint16_t le_pan = byteorder_btols(byteorder_htons(pan)); + le_uint16_t le_pan = byteorder_htols(pan); DEBUG("pan0: %u, pan1: %u\n", le_pan.u8[0], le_pan.u8[1]); at86rf2xx_reg_write(dev, AT86RF2XX_REG__PAN_ID_0, le_pan.u8[0]); From 7a7ebb1d5bd05b823cd1ed9678216ab73729e108 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Dec 2020 13:40:57 +0100 Subject: [PATCH 2/6] drivers/mrf24j40: use byteorder_htols() same as 374d032b821290074bae76a78b2bd1c896527d1a --- drivers/mrf24j40/mrf24j40_getset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mrf24j40/mrf24j40_getset.c b/drivers/mrf24j40/mrf24j40_getset.c index ca785a201a..da9d73eeff 100644 --- a/drivers/mrf24j40/mrf24j40_getset.c +++ b/drivers/mrf24j40/mrf24j40_getset.c @@ -260,7 +260,7 @@ uint16_t mrf24j40_get_pan(mrf24j40_t *dev) void mrf24j40_set_pan(mrf24j40_t *dev, uint16_t pan) { - le_uint16_t le_pan = byteorder_btols(byteorder_htons(pan)); + le_uint16_t le_pan = byteorder_htols(pan); DEBUG("pan0: %u, pan1: %u\n", le_pan.u8[0], le_pan.u8[1]); mrf24j40_reg_write_short(dev, MRF24J40_REG_PANIDL, le_pan.u8[0]); From 129e9ae8a3969e5e951d1af59905d07368a34958 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Dec 2020 16:29:10 +0100 Subject: [PATCH 3/6] sys/gnrc_lorawan: use byteorder_htols()/byteorder_htoll() --- sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_crypto.c | 4 ++-- sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_mcps.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_crypto.c b/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_crypto.c index 535a483155..4eb439f4eb 100644 --- a/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_crypto.c +++ b/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_crypto.c @@ -67,7 +67,7 @@ void gnrc_lorawan_calculate_mic(const le_uint32_t *dev_addr, uint32_t fcnt, memcpy(&block.dev_addr, dev_addr, sizeof(le_uint32_t)); - block.fcnt = byteorder_btoll(byteorder_htonl(fcnt)); + block.fcnt = byteorder_htoll(fcnt); block.u32_pad = 0; @@ -103,7 +103,7 @@ void gnrc_lorawan_encrypt_payload(iolist_t *iolist, const le_uint32_t *dev_addr, block->dir = dir & DIR_MASK; block->dev_addr = *dev_addr; - block->fcnt = byteorder_btoll(byteorder_htonl(fcnt)); + block->fcnt = byteorder_htoll(fcnt); block->u32_pad = 0; diff --git a/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_mcps.c b/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_mcps.c index 09f55f4bf5..eb335f5ecf 100644 --- a/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_mcps.c +++ b/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_mcps.c @@ -221,7 +221,7 @@ size_t gnrc_lorawan_build_hdr(uint8_t mtype, le_uint32_t *dev_addr, lorawan_hdr_set_ack(lw_hdr, ack); lorawan_hdr_set_frame_opts_len(lw_hdr, fopts_length); - lw_hdr->fcnt = byteorder_btols(byteorder_htons(fcnt)); + lw_hdr->fcnt = byteorder_htols(fcnt); buf->index += sizeof(lorawan_hdr_t); @@ -248,7 +248,7 @@ size_t gnrc_lorawan_build_uplink(gnrc_lorawan_t *mac, iolist_t *payload, lorawan_hdr_set_ack(lw_hdr, mac->mcps.ack_requested); - lw_hdr->fcnt = byteorder_btols(byteorder_htons(mac->mcps.fcnt)); + lw_hdr->fcnt = byteorder_htols(mac->mcps.fcnt); buf.index += sizeof(lorawan_hdr_t); From dd87737ca0100875f9e81940f4e60bc336cb5629 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Dec 2020 16:30:17 +0100 Subject: [PATCH 4/6] gnrc/gomach: use byteorder_htols() --- sys/net/gnrc/link_layer/gomach/gomach_internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/gnrc/link_layer/gomach/gomach_internal.c b/sys/net/gnrc/link_layer/gomach/gomach_internal.c index e83e416bf8..621ee3f447 100644 --- a/sys/net/gnrc/link_layer/gomach/gomach_internal.c +++ b/sys/net/gnrc/link_layer/gomach/gomach_internal.c @@ -56,7 +56,7 @@ int _gnrc_gomach_transmit(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt) size_t src_len, dst_len; uint8_t mhr[IEEE802154_MAX_HDR_LEN]; uint8_t flags = (uint8_t)(state->flags & NETDEV_IEEE802154_SEND_MASK); - le_uint16_t dev_pan = byteorder_btols(byteorder_htons(state->pan)); + le_uint16_t dev_pan = byteorder_htols(state->pan); flags |= IEEE802154_FCF_TYPE_DATA; if (pkt == NULL) { From ec5e45defb637466e4370de901ac932a7254251e Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Dec 2020 16:30:43 +0100 Subject: [PATCH 5/6] gnrc/lwmac: use byteorder_htols() --- sys/net/gnrc/link_layer/lwmac/lwmac_internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/gnrc/link_layer/lwmac/lwmac_internal.c b/sys/net/gnrc/link_layer/lwmac/lwmac_internal.c index 112228ec7a..424fa4ee4f 100644 --- a/sys/net/gnrc/link_layer/lwmac/lwmac_internal.c +++ b/sys/net/gnrc/link_layer/lwmac/lwmac_internal.c @@ -43,7 +43,7 @@ int _gnrc_lwmac_transmit(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt) size_t src_len, dst_len; uint8_t mhr[IEEE802154_MAX_HDR_LEN]; uint8_t flags = (uint8_t)(state->flags & NETDEV_IEEE802154_SEND_MASK); - le_uint16_t dev_pan = byteorder_btols(byteorder_htons(state->pan)); + le_uint16_t dev_pan = byteorder_htols(state->pan); flags |= IEEE802154_FCF_TYPE_DATA; if (pkt == NULL) { From 518c95e0eed3d15ac311d774b97caf3b14547f6a Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Dec 2020 16:31:20 +0100 Subject: [PATCH 6/6] gnrc_netif_ieee802154_create: use byteorder_htols() --- sys/net/gnrc/netif/ieee802154/gnrc_netif_ieee802154.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/gnrc/netif/ieee802154/gnrc_netif_ieee802154.c b/sys/net/gnrc/netif/ieee802154/gnrc_netif_ieee802154.c index 8a53aeba13..7763d351b1 100644 --- a/sys/net/gnrc/netif/ieee802154/gnrc_netif_ieee802154.c +++ b/sys/net/gnrc/netif/ieee802154/gnrc_netif_ieee802154.c @@ -224,7 +224,7 @@ static int _send(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt) size_t src_len, dst_len; uint8_t mhr[IEEE802154_MAX_HDR_LEN]; uint8_t flags = (uint8_t)(state->flags & NETDEV_IEEE802154_SEND_MASK); - le_uint16_t dev_pan = byteorder_btols(byteorder_htons(state->pan)); + le_uint16_t dev_pan = byteorder_htols(state->pan); flags |= IEEE802154_FCF_TYPE_DATA; if (pkt == NULL) {