fix cc1100/tap buffer constants

RIOT-OS · Jul 27, 2013 · 047c503 · 047c503
1 parent d46f36f
commit 047c503
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/cpu/native/cc110x_ng/cc1100-sim.c b/cpu/native/cc110x_ng/cc1100-sim.c
@@ -416,7 +416,7 @@ void do_write_patable(uint8_t c)
 void do_write_tx(uint8_t c)
 {
     DEBUG("write TX\n");
-    if (status_registers[CC1100_TXBYTES - 0x30] == BUFFER_LENGTH) {
+    if (status_registers[CC1100_TXBYTES - 0x30] == CC1100_FIFO_LENGTH) {
         errx(EXIT_FAILURE, "do_write_tx: buffer too small");
     }
     tx_fifo[tx_fifo_idx++] = c;

diff --git a/cpu/native/cc110x_ng/cc110x_ng_cpu.c b/cpu/native/cc110x_ng/cc110x_ng_cpu.c
@@ -20,8 +20,6 @@
 
 
 static int _native_cc110x_enabled;
-//static char rx_buffer[BUFFER_LENGTH], tx_buffer[BUFFER_LENGTH];
-//static int rx_bi, rx_bc, tx_bi, tx_bc;
 
 /* arch */
 

diff --git a/cpu/native/include/cc1100sim.h b/cpu/native/include/cc1100sim.h
@@ -35,3 +35,5 @@ uint8_t read_single(uint8_t c);
 #define STATE_WRITE_S   0x05
 
 void _native_cc1100_handle_packet(char *buf, int size);
+
+#define CC1100_FIFO_LENGTH  64
diff --git a/cpu/native/include/tap.h b/cpu/native/include/tap.h
@@ -3,8 +3,6 @@
 
 #include <net/ethernet.h>
 
-#define BUFFER_LENGTH 255
-
 /**
  * create and/or open tap device "name"
  *

diff --git a/cpu/native/tap.c b/cpu/native/tap.c
@@ -28,13 +28,15 @@
 #include "cc1100sim.h"
 #include "cc110x-internal.h" /* CC1100 constants */
 
+#define TAP_BUFFER_LENGTH (CC1100_FIFO_LENGTH + ETHER_HDR_LEN + 1)
+
 int _native_tap_fd;
 char _native_tap_mac[ETHER_ADDR_LEN];
 
 void _native_handle_cc110xng_input(void)
 {
     int nread;
-    char buf[BUFFER_LENGTH];
+    char buf[TAP_BUFFER_LENGTH];
     union eth_frame *f;
 
     DEBUG("_native_handle_cc110xng_input\n");
@@ -43,7 +45,7 @@ void _native_handle_cc110xng_input(void)
        TODO: refactor this into general io-signal multiplexer */
 
     _native_in_syscall = 1;
-    nread = read(_native_tap_fd, buf, BUFFER_LENGTH);
+    nread = read(_native_tap_fd, buf, TAP_BUFFER_LENGTH);
     _native_in_syscall = 0;
     DEBUG("_native_handle_cc110xng_input - read %d bytes\n", nread);
     if (nread > 0) {
@@ -72,7 +74,7 @@ void _native_handle_cc110xng_input(void)
 
 int send_buf(void)
 {
-    uint8_t buf[BUFFER_LENGTH];
+    uint8_t buf[TAP_BUFFER_LENGTH];
     int nsent;
     uint8_t to_send;