!fixup drivers/at86rf215/at86rf215.c

RIOT-OS · Mar 6, 2020 · f78fde3 · f78fde3
1 parent c0e08e4
commit f78fde3
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/drivers/at86rf215/at86rf215.c b/drivers/at86rf215/at86rf215.c
@@ -73,9 +73,6 @@ void at86rf215_reset_cfg(at86rf215_t *dev)
 
     dev->netdev.pan = IEEE802154_DEFAULT_PANID;
 
-    /* apply the configuration */
-    at86rf215_reset(dev);
-
     /* set default options */
     dev->retries_max = 3;
     dev->csma_retries_max = 4;
@@ -85,13 +82,17 @@ void at86rf215_reset_cfg(at86rf215_t *dev)
     dev->flags |= AT86RF215_OPT_AUTOACK
                |  AT86RF215_OPT_CSMA;
 
+    /* apply the configuration */
+    at86rf215_reset(dev);
+
     /* default to requesting ACKs, just like at86rf2xx */
     const netopt_enable_t enable = NETOPT_ENABLE;
     netdev_ieee802154_set(&dev->netdev, NETOPT_ACK_REQ, &enable, sizeof(enable));
 }
 
 void at86rf215_reset(at86rf215_t *dev)
 {
+    uint8_t reg;
     dev->state = AT86RF215_STATE_OFF;
 
     /* Reset state machine to ensure a known state */
@@ -137,11 +138,14 @@ void at86rf215_reset(at86rf215_t *dev)
     at86rf215_reg_write(dev, dev->BBC->RG_AMAACKPD, AMAACKPD_PD0_MASK);
 
     /* enable auto-ACK with Frame Checksum & Data Rate derived from RX frame */
-    at86rf215_reg_write(dev, dev->BBC->RG_AMCS, AMCS_AACK_MASK
-                                              | AMCS_AACKFA_MASK
-                                              | AMCS_AACKDR_MASK);
+    reg = AMCS_AACKFA_MASK | AMCS_AACKDR_MASK;
+    if (dev->flags & AT86RF215_OPT_AUTOACK) {
+        reg |= AMCS_AACK_MASK;
+    }
+
+    at86rf215_reg_write(dev, dev->BBC->RG_AMCS, reg);
 
-/* set compatibility with first-gen 802.15.4 devices */
+    /* set compatibility with first-gen 802.15.4 devices */
     at86rf215_configure_legacy_OQPSK(dev, 0);
 
     /* set default channel */