From 26ead7b5be88453b6904c5551591ecdfb8ba4688 Mon Sep 17 00:00:00 2001 From: Jose Alamos Date: Thu, 1 Jul 2021 11:58:34 +0200 Subject: [PATCH 1/4] drivers/sx127x: fix size of rx symbol timeout --- drivers/include/sx127x.h | 2 +- drivers/sx127x/sx127x_getset.c | 6 +++--- drivers/sx127x/sx127x_netdev.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/include/sx127x.h b/drivers/include/sx127x.h index bddce07705..386effcf67 100644 --- a/drivers/include/sx127x.h +++ b/drivers/include/sx127x.h @@ -637,7 +637,7 @@ void sx127x_set_preamble_length(sx127x_t *dev, uint16_t preamble); * @param[in] dev The sx127x device descriptor * @param[in] timeout The LoRa symbol timeout */ -void sx127x_set_symbol_timeout(sx127x_t *dev, uint16_t timeout); +void sx127x_set_symbol_timeout(sx127x_t *dev, uint8_t timeout); /** * @brief Sets the SX127X RX timeout diff --git a/drivers/sx127x/sx127x_getset.c b/drivers/sx127x/sx127x_getset.c index 9ec4bcd8c3..cc781802a5 100644 --- a/drivers/sx127x/sx127x_getset.c +++ b/drivers/sx127x/sx127x_getset.c @@ -866,16 +866,16 @@ void sx127x_set_tx_timeout(sx127x_t *dev, uint32_t timeout) dev->settings.lora.tx_timeout = timeout; } -void sx127x_set_symbol_timeout(sx127x_t *dev, uint16_t timeout) +void sx127x_set_symbol_timeout(sx127x_t *dev, uint8_t timeout) { DEBUG("[sx127x] Set symbol timeout: %d\n", timeout); uint8_t config2_reg = sx127x_reg_read(dev, SX127X_REG_LR_MODEMCONFIG2); config2_reg &= SX127X_RF_LORA_MODEMCONFIG2_SYMBTIMEOUTMSB_MASK; - config2_reg |= (timeout >> 8) & ~SX127X_RF_LORA_MODEMCONFIG2_SYMBTIMEOUTMSB_MASK; + config2_reg |= timeout & ~SX127X_RF_LORA_MODEMCONFIG2_SYMBTIMEOUTMSB_MASK; sx127x_reg_write(dev, SX127X_REG_LR_MODEMCONFIG2, config2_reg); - sx127x_reg_write(dev, SX127X_REG_LR_SYMBTIMEOUTLSB, timeout & 0xFF); + sx127x_reg_write(dev, SX127X_REG_LR_SYMBTIMEOUTLSB, timeout); } bool sx127x_get_iq_invert(const sx127x_t *dev) diff --git a/drivers/sx127x/sx127x_netdev.c b/drivers/sx127x/sx127x_netdev.c index d527d34da2..1515598b9a 100644 --- a/drivers/sx127x/sx127x_netdev.c +++ b/drivers/sx127x/sx127x_netdev.c @@ -444,8 +444,8 @@ static int _set(netdev_t *netdev, netopt_t opt, const void *val, size_t len) return sizeof(netopt_enable_t); case NETOPT_RX_SYMBOL_TIMEOUT: - assert(len <= sizeof(uint16_t)); - sx127x_set_symbol_timeout(dev, *((const uint16_t *)val)); + assert(len <= sizeof(uint8_t)); + sx127x_set_symbol_timeout(dev, *((const uint8_t *)val)); return sizeof(uint16_t); case NETOPT_RX_TIMEOUT: From 79e194783c1b34d6249dbb56a888e4beac162255 Mon Sep 17 00:00:00 2001 From: Jose Alamos Date: Thu, 1 Jul 2021 11:59:22 +0200 Subject: [PATCH 2/4] pkg/semtech-loramac: use uint8_t for NETOPT_RX_SYMBOL_TIMEOUT --- pkg/semtech-loramac/contrib/semtech_loramac_radio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/semtech-loramac/contrib/semtech_loramac_radio.c b/pkg/semtech-loramac/contrib/semtech_loramac_radio.c index ea05dcb2ac..3303daa492 100644 --- a/pkg/semtech-loramac/contrib/semtech_loramac_radio.c +++ b/pkg/semtech-loramac/contrib/semtech_loramac_radio.c @@ -127,7 +127,10 @@ void SX127XSetRxConfig(RadioModems_t modem, uint32_t bandwidth, loramac_netdev_ptr->driver->set(loramac_netdev_ptr, NETOPT_CHANNEL_HOP_PERIOD, &hopPeriod, sizeof(uint8_t)); netopt_enable_t iq_inverted = (iqInverted) ? NETOPT_ENABLE : NETOPT_DISABLE; loramac_netdev_ptr->driver->set(loramac_netdev_ptr, NETOPT_IQ_INVERT, &iq_inverted, sizeof(netopt_enable_t)); - loramac_netdev_ptr->driver->set(loramac_netdev_ptr, NETOPT_RX_SYMBOL_TIMEOUT, &symbTimeout, sizeof(uint16_t)); + assert(symbTimeout <= UINT8_MAX); + uint8_t symbol_timeout = symbTimeout; + loramac_netdev_ptr->driver->set(loramac_netdev_ptr, NETOPT_RX_SYMBOL_TIMEOUT, + &symbol_timeout, sizeof(symbol_timeout)); netopt_enable_t single_rx = rxContinuous ? NETOPT_DISABLE : NETOPT_ENABLE; loramac_netdev_ptr->driver->set(loramac_netdev_ptr, NETOPT_SINGLE_RECEIVE, &single_rx, sizeof(netopt_enable_t)); } From e791a86971785babb9a7750a4be01cce760a7527 Mon Sep 17 00:00:00 2001 From: Jose Alamos Date: Thu, 1 Jul 2021 11:59:39 +0200 Subject: [PATCH 3/4] net/gnrc_lorawan: use uint8_t for NETOPT_RX_SYMBOL_TIMEOUT --- sys/net/gnrc/link_layer/lorawan/gnrc_lorawan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan.c b/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan.c index efeab23dd7..c3ec9dc459 100644 --- a/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan.c +++ b/sys/net/gnrc/link_layer/lorawan/gnrc_lorawan.c @@ -129,7 +129,7 @@ static void _config_radio(gnrc_lorawan_t *mac, uint32_t channel_freq, /* Switch to single listen mode */ const netopt_enable_t single = true; dev->driver->set(dev, NETOPT_SINGLE_RECEIVE, &single, sizeof(single)); - const uint16_t timeout = CONFIG_GNRC_LORAWAN_MIN_SYMBOLS_TIMEOUT; + const uint8_t timeout = CONFIG_GNRC_LORAWAN_MIN_SYMBOLS_TIMEOUT; dev->driver->set(dev, NETOPT_RX_SYMBOL_TIMEOUT, &timeout, sizeof(timeout)); } From 5ef4c0a778ab7d4f625d63fdafe5e8347bfe479d Mon Sep 17 00:00:00 2001 From: Jose Alamos Date: Thu, 1 Jul 2021 12:00:25 +0200 Subject: [PATCH 4/4] tests/driver_sx127x: use uint8_t for NETOPT_RX_SYMBOL_TIMEOUT --- tests/driver_sx127x/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/driver_sx127x/main.c b/tests/driver_sx127x/main.c index 6f5063a3a7..29d859cbd5 100644 --- a/tests/driver_sx127x/main.c +++ b/tests/driver_sx127x/main.c @@ -359,7 +359,7 @@ int rx_timeout_cmd(int argc, char **argv) } netdev_t *netdev = (netdev_t *)&sx127x; - uint16_t rx_timeout; + uint8_t rx_timeout; if (strstr(argv[1], "set") != NULL) { if (argc < 3) {