Merge pull request #151 from andreagilardoni/ethernet-fixes

[WIRE-98] Ethernet driver and LWIP wrapper fixes

Author: facchinm

extras/net/lwipopts.h

@@ -137,7 +137,7 @@
  * a lot of data that needs to be copied, this should be set high.
  */
 #ifndef MEM_SIZE
-#define MEM_SIZE                        (1522*4)
+#define MEM_SIZE                        (15*1024)
 #endif
 
 
@@ -596,7 +596,7 @@
  * Define to 0 if your device is low on memory.
  */
 #ifndef TCP_QUEUE_OOSEQ
-#define TCP_QUEUE_OOSEQ                 (LWIP_TCP)
+#define TCP_QUEUE_OOSEQ                 0
 #endif
 
 /**

libraries/Ethernet/src/EthernetDriver.cpp

@@ -64,7 +64,7 @@ class EthernetDriver {
 #define ETHER_FRAME_TRANSFER_COMPLETED          (1UL << 21)
 #define ETHER_MAGIC_PACKET_DETECTED_MASK        (1UL << 1)
 
-static volatile bool frame_transmitted_flag = false;
+static volatile bool frame_being_transmitted = false;
 static EthernetDriver eth_driver;
 
 static uint8_t eth_tx_buffer[ETH_BUFF_DIM];
@@ -230,7 +230,7 @@ void EthernetDriver::irq_callback(ether_callback_args_t * p_args) {
             if (ETHER_FRAME_TRANSFER_COMPLETED == (reg_eesr & ETHER_FRAME_TRANSFER_COMPLETED)) {
 
 
-                frame_transmitted_flag = true;
+                frame_being_transmitted = false;
                 /* FRAME TRANSMISSION COMPLETED */
                 if(frame_transmitted != nullptr) {
                     frame_transmitted();
@@ -341,18 +341,23 @@ void eth_release_rx_buffer() {
 
 
 bool eth_output(uint8_t *buf, uint16_t dim) {
-    frame_transmitted_flag = false;
-    fsp_err_t err = R_ETHER_Write ( eth_driver.get_ctrl(), buf, dim);
-    if(err == FSP_SUCCESS) {
-        
-        while(!frame_transmitted_flag) {
+    bool retval = true;
 
-        }
-        return true;
+    fsp_err_t err = R_ETHER_Write(eth_driver.get_ctrl(), buf, dim);
+    if(err == FSP_SUCCESS) {
+        frame_being_transmitted = true;
+        retval = true;
     }
     else {
-        return false;
+        retval = false;
     }
+
+    return retval;
+}
+
+// this function return true if the tx buffer is not being used for the transmission of another frame
+bool eth_output_can_transimit() {
+    return !frame_being_transmitted;
 }
 
 uint8_t *eth_input(volatile uint32_t *dim) {

libraries/Ethernet/src/EthernetDriver.h

@@ -5,8 +5,9 @@
 #include "r_ether_phy.h"
 #include "r_ether_api.h"
 #include "r_ether.h"
+#include <functional>
 
-using EtherCallback_f        = void (*)(void);
+using EtherCallback_f        = std::function<void(void)>;
 
 #define ETHERNET_IRQ_PRIORITY   10
 
@@ -23,6 +24,7 @@ bool eth_init();
 void eth_execute_link_process();
 uint8_t *eth_input(volatile uint32_t *dim);
 bool eth_output(uint8_t *buf, uint16_t dim);
+bool eth_output_can_transimit();
 void eth_release_rx_buffer();
 uint8_t *eth_get_tx_buffer(uint16_t *size);
 void eth_set_rx_frame_cbk(EtherCallback_f fn);
@@ -33,5 +35,4 @@ void eth_set_lan_wake_up_cbk(EtherCallback_f fn);
 void eth_set_magic_packet_cbk(EtherCallback_f fn);
 
 
-
-#endif
+#endif