sys/net/link_layer/ieee802154/submac: move ack transmission

cpu/native/Makefile.dep

@@ -43,7 +43,6 @@ ifneq (,$(filter socket_zep,$(USEMODULE)))
   USEMODULE += ieee802154
   ifneq (,$(filter netdev,$(USEMODULE)))
     USEMODULE += netdev_ieee802154_submac
-    USEMODULE += netdev_ieee802154_submac_soft_ack
   endif
 endif
 

cpu/nrf52/Makefile.dep

@@ -14,7 +14,6 @@ ifneq (,$(filter nrf802154,$(USEMODULE)))
   USEMODULE += luid
   ifneq (,$(filter netdev,$(USEMODULE)))
     USEMODULE += netdev_ieee802154_submac
-    USEMODULE += netdev_ieee802154_submac_soft_ack
   endif
 endif
 

drivers/netdev_ieee802154_submac/Makefile

@@ -1 +1,5 @@
+ifneq (,$(filter netdev_ieee802154_submac_soft_ack,$(USEMODULE)))
+  $(warning SubMAC Soft ACK is now on by default and will be deprecated.)
+endif
+
 include $(RIOTBASE)/Makefile.base

drivers/netdev_ieee802154_submac/netdev_ieee802154_submac.c

@@ -286,7 +286,7 @@ static int _recv(netdev_t *netdev, void *buf, size_t len, void *info)
                                                              netdev_ieee802154_submac_t,
                                                              dev);
     ieee802154_submac_t *submac = &netdev_submac->submac;
-    ieee802154_rx_info_t rx_info;
+    ieee802154_rx_info_t rx_info = { 0 };
 
     if (buf == NULL && len == 0) {
         return ieee802154_get_frame_length(submac);
@@ -303,30 +303,7 @@ static int _recv(netdev_t *netdev, void *buf, size_t len, void *info)
 
         netdev_rx_info->lqi = rx_info.lqi;
     }
-#if IS_USED(MODULE_NETDEV_IEEE802154_SUBMAC_SOFT_ACK)
-    const uint8_t *mhr = buf;
-    if ((mhr[0] & IEEE802154_FCF_TYPE_MASK) == IEEE802154_FCF_TYPE_DATA &&
-        (mhr[0] & IEEE802154_FCF_ACK_REQ)) {
-        ieee802154_filter_mode_t mode;
-        if (!ieee802154_radio_has_capability(&submac->dev, IEEE802154_CAP_AUTO_ACK) &&
-            (ieee802154_radio_get_frame_filter_mode(&submac->dev, &mode) < 0
-                || mode == IEEE802154_FILTER_ACCEPT)) {
-            /* send ACK if not handled by the driver and not in promiscuous mode */
-            uint8_t ack[IEEE802154_ACK_FRAME_LEN - IEEE802154_FCS_LEN]
-                = { IEEE802154_FCF_TYPE_ACK, 0x00, ieee802154_get_seq(mhr) };
-            iolist_t io = {
-                .iol_base = ack,
-                .iol_len = sizeof(ack),
-                .iol_next = NULL
-            };
-            DEBUG("IEEE802154 submac: Sending ACK\n");
-            int snd = _send(netdev, &io);
-            if (snd < 0) {
-                DEBUG("IEEE802154 submac: failed to send ACK (%d)\n", snd);
-            }
-        }
-    }
-#endif
+
     return res;
 }
 

makefiles/deprecated_modules.inc.mk

@@ -2,3 +2,4 @@
 # Keep this list ALPHABETICALLY SORTED!!!!111elven
 DEPRECATED_MODULES += gnrc_nettype_lorawan
 DEPRECATED_MODULES += sema_deprecated
+DEPRECATED_MODULES += netdev_ieee802154_submac_soft_ack

sys/include/net/ieee802154/submac.h

@@ -30,30 +30,36 @@
  *  |   RX   |        |PREPARE |<--->|   TX   |
  *  |        |   +--->|        |     |        |
  *  +--------+   |    +--------+     +--------+
- *      ^        |        ^              |
- *      |        |        |              |
- *      |        |        |              |
- *      |        |    +--------+         |
- *      |        |    |        |         v
- *      |        |    |WAIT FOR|<--------+
- *      |        |    |  ACK   |         |
- *      |        |    +--------+         |
- *      |        |         |             |
- *      |        |         |             |
- *      |        |         v             |
- *      |        |     +--------+        |
- *      |        +-----|        |        |
- *      |              |  IDLE  |        |
- *      +------------->|        |<-------+
- *                     +--------+
+ *     |  ^      |        ^              |
+ *     |  |      |        |              |
+ *     |  |      |        |              |
+ *     |  |      |    +--------+         |
+ *     |  |      |    |        |         v
+ *     |  |      |    |WAIT FOR|<--------+
+ *     |  |      |    |  ACK   |         |
+ *     |  |      |    +--------+         |
+ *     |  |      |         |             |
+ *     |  |      |         |             |
+ *     |  |      |         v             |
+ *     |  |      |     +--------+        |
+ *     |  |      +-----|        |        |
+ *     |  |            |  IDLE  |        |
+ *     |  +----------->|        |<-------+
+ *     |               +--------+
+ *     |    +--------+     ^
+ *     |    |        |     |
+ *     +--->| TX ACK |-----+
+ *          |        |
+ *          +--------+
  * ```
  *
  * - IDLE: The transceiver is off and therefore cannot receive frames. Sending
  *   frames might be triggered using @ref ieee802154_send. The next SubMAC
  *   state would be PREPARE.
  * - RX: The device is ready to receive frames. In case the SubMAC receives a
- *   frame it will call @ref ieee802154_submac_cb_t::rx_done and immediately go
- *   to IDLE. Same as the IDLE state, it's possible
+ *   frame it will transmit an ACK frame if necessary then call
+ *   @ref ieee802154_submac_cb_t::rx_done and immediately go
+ *   to IDLE or TX ACK. Same as the IDLE state, it's possible
  *   to trigger frames using @ref ieee802154_send.
  * - PREPARE: The frame is already in the framebuffer and waiting to be
  *   transmitted.  This state might handle CSMA-CA backoff timer in case the
@@ -71,22 +77,25 @@
  *   (either triggered by the radio or a timer), the SubMAC goes to either
  *   IDLE if there are no more retransmissions left or no more CSMA-CA
  *   retries or PREPARE otherwise.
+ * - TX ACK: The received frame requires instantanous acknowledgement. Sending
+ *   further frames in this state is not permitted. After ACK transmission is
+ *   completed, the SubMAC will go IDLE.
  *
  * The events that trigger state machine changes are defined in
  * @ref ieee802154_fsm_state_t
  *
  * The following events are valid for each state:
  *
- *  Event/State  | RX | IDLE  | PREPARE | TX | WAIT FOR ACK
- * --------------|----|-------|---------|----|-------------
- * TX_DONE       | -  | -     | -       | X  | -
- * RX_DONE       | X  | X*    | X*      | X* | X
- * CRC_ERROR     | X  | X*    | X*      | X* | X
- * ACK_TIMEOUT   | -  | -     | -       | -  | X
- * BH            | -  | -     | X       | -  | -
- * REQ_TX        | X  | X     | -       | -  | -
- * REQ_SET_RX_ON | -  | X     | -       | -  | -
- * REQ_SET_IDLE  | X  | -     | -       | -  | -
+ *  Event/State  | RX | IDLE  | PREPARE | TX | WAIT FOR ACK | TX ACK |
+ * --------------|----|-------|---------|----|------------------------
+ * TX_DONE       | -  | -     | -       | X  | -            |X
+ * RX_DONE       | X  | X*    | X*      | X* | X            |-
+ * CRC_ERROR     | X  | X*    | X*      | X* | X            |-
+ * ACK_TIMEOUT   | -  | -     | -       | -  | X            |-
+ * BH            | -  | -     | X       | -  | -            |-
+ * REQ_TX        | X  | X     | -       | -  | -            |-
+ * REQ_SET_RX_ON | -  | X     | -       | -  | -            |-
+ * REQ_SET_IDLE  | X  | -     | -       | -  | -            |-
  *
  * *: RX_DONE and CRC_ERROR during these events might be a race condition
  *    between the ACK Timer and the radios RX_DONE event. If this happens, the
@@ -167,6 +176,7 @@ typedef enum {
    IEEE802154_FSM_STATE_PREPARE,        /**< The SubMAC is preparing the next transmission */
    IEEE802154_FSM_STATE_TX,             /**< The SubMAC is currently transmitting a frame */
    IEEE802154_FSM_STATE_WAIT_FOR_ACK,   /**< The SubMAC is waiting for an ACK frame */
+   IEEE802154_FSM_STATE_TX_ACK,         /**< The SubMAC is transmitting an ACK frame */
    IEEE802154_FSM_STATE_NUMOF,          /**< Number of SubMAC FSM states */
 } ieee802154_fsm_state_t;
 
@@ -208,6 +218,9 @@ struct ieee802154_submac {
     ieee802154_fsm_state_t fsm_state;    /**< State of the SubMAC */
     ieee802154_phy_mode_t phy_mode;     /**< IEEE 802.15.4 PHY mode */
     const iolist_t *psdu;               /**< stores the current PSDU */
+    uint8_t rx_buf[IEEE802154_FRAME_LEN_MAX]; /**< stores received frame */
+    size_t rx_len;                      /**< stores length of received frame */
+    ieee802154_rx_info_t rx_info;       /**< stores lqi and rssi of received frame */
 };
 
 /**
@@ -410,26 +423,20 @@ static inline int ieee802154_set_tx_power(ieee802154_submac_t *submac,
 /**
  * @brief Get the received frame length
  *
- * @pre this function MUST be called either inside @ref ieee802154_submac_cb_t::rx_done
- *      or in SLEEP state.
- *
  * @param[in] submac pointer to the SubMAC
  *
  * @return length of the PSDU (excluding FCS length)
  */
 static inline int ieee802154_get_frame_length(ieee802154_submac_t *submac)
 {
-    return ieee802154_radio_len(&submac->dev);
+    return submac->rx_len;
 }
 
 /**
  * @brief Read the received frame
  *
  * This functions reads the received PSDU from the device (excluding FCS)
  *
- * @pre this function MUST be called either inside @ref ieee802154_submac_cb_t::rx_done
- *      or in SLEEP state.
- *
  * @param[in] submac pointer to the SubMAC descriptor
  * @param[out] buf buffer to write into. If NULL, the packet is discarded
  * @param[in] len length of the buffer
@@ -441,7 +448,15 @@ static inline int ieee802154_get_frame_length(ieee802154_submac_t *submac)
 static inline int ieee802154_read_frame(ieee802154_submac_t *submac, void *buf,
                                         size_t len, ieee802154_rx_info_t *info)
 {
-    return ieee802154_radio_read(&submac->dev, buf, len, info);
+    if (submac->rx_len > len) {
+        return -ENOBUFS;
+    }
+    if (info != NULL) {
+        info->rssi = submac->rx_info.rssi;
+        info->lqi = submac->rx_info.lqi;
+    }
+    memcpy(buf, submac->rx_buf, submac->rx_len);
+    return submac->rx_len;
 }
 
 /**