improvement/bugfix: added higher layer headers to tx packet

RIOT-OS · Jan 27, 2015 · ac6398c · ac6398c
1 parent 279e359
commit ac6398c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/drivers/include/kw2xrf.h b/drivers/include/kw2xrf.h
@@ -58,6 +58,7 @@ extern "C" {
 
 #define MKW2XDRF_RX_BUF_SIZE       3        /**< Max buffer size of kw2xrf rx buffer. */
 
+#define MKW2XDRF_HEADER_LENGTH     3        /**< Physical-layer header lengh. */
 #define MKW2XDRF_MAX_PKT_LENGTH    127      /**< Max packet length for kw2xrf device. */
 #define MKW2XDRF_MAX_DATA_LENGTH   118      /**< Max data length in packet for kw2xrf device. */
 

diff --git a/drivers/kw2xrf/kw2xrf_spi.c b/drivers/kw2xrf/kw2xrf_spi.c
@@ -203,7 +203,7 @@ radio_packet_length_t kw2xrf_write_fifo(uint8_t *data, radio_packet_length_t len
 
     KW2XDRF_SPI->POPR;
 
-    for (i = 0; i < (length - 1); i++) {
+    for (i = 0; i < length; i++) {
         while (!(KW2XDRF_SPI->SR & SPI_SR_TFFF_MASK));
 
         KW2XDRF_SPI->PUSHR = SPI_PUSHR_CTAS(0)

diff --git a/drivers/kw2xrf/kw2xrf_tx.c b/drivers/kw2xrf/kw2xrf_tx.c
@@ -16,6 +16,7 @@
  * @author      Jonas Remmert <j.remmert@phytec.de>
  */
 #include <stdio.h>
+#include <string.h>
 
 #include "kw2xrf.h"
 #include "kw2xrf_reg.h"
@@ -43,9 +44,16 @@ netdev_802154_tx_status_t kw2xrf_load_tx_buf(netdev_t *dev,
         void *buf,
         unsigned int len)
 {
+
+    netdev_hlist_t *ulhdrs_ptr = upper_layer_hdrs;
+
     /* Use seperate name for hdr, with an shifted index for more intuitive addressing. */
     uint8_t pkt[MKW2XDRF_MAX_PKT_LENGTH - 1];
     uint8_t *hdr = pkt + 1;
+
+    if (dev != &kw2xrf_netdev) {
+        return -ENODEV;
+    }
 
     /* FCS : frame version 0, we don't manage security,
        nor batchs of packets */
@@ -136,15 +144,22 @@ netdev_802154_tx_status_t kw2xrf_load_tx_buf(netdev_t *dev,
         hdr[idx++] = (uint8_t)(src_addr >> 8);
     }
 
-    /* total frame size */
-    uint8_t size = idx + len + 2;
+    /* Prepend upper layer headers  */
+    if (upper_layer_hdrs) {
+        do {
+            memcpy(&(pkt[idx + 1]), ulhdrs_ptr->header, ulhdrs_ptr->header_len);
+            idx += ulhdrs_ptr->header_len;
+            netdev_hlist_advance(&ulhdrs_ptr);
+        } while (ulhdrs_ptr != upper_layer_hdrs);
+    }
 
+    /* total frame size, extra 2 for FCS, 1 for size in  pkt[0] */
+    uint8_t size = idx + len + 3;
     if (size > MKW2XDRF_MAX_PKT_LENGTH) {
         return NETDEV_802154_TX_STATUS_PACKET_TOO_LONG;
     }
-
     pkt[0] = size;
-
+    
     /* generate pkt, header data is already in pkt, header data was written above to hdr[] array. */
     for (uint8_t i = 0; i < len; i++) {
         pkt[i + idx + 1] = ((uint8_t *)buf)[i];