lwip_callback can take a cbData

Author: earlephilhower

cores/rp2040/freertos/variantHooks.cpp

@@ -932,7 +932,7 @@ static void lwipThread(void *params) {
                 case __callback:
                 {
                     __callback_req *r = (__callback_req *)w.req;
-                    r->cb();
+                    r->cb(r->cbData);
                     break;
                 }
                 default:

cores/rp2040/lwip_wrap.cpp

@@ -829,15 +829,15 @@ extern "C" {
         return __real_ethernet_input(p, netif);
     }
 
-    void lwip_callback(void (*cb)()) {
+    void lwip_callback(void (*cb)(void *), void *cbData) {
 #ifdef __FREERTOS
         if (!__isLWIPThread()) {
-            __callback_req req = { cb };
+            __callback_req req = { cb, cbData };
             __lwip(__callback, &req);
             return;
         }
 #endif
-        cb();
+        cb(cbData);
         return;
     }
 

include/lwipopts.h

@@ -83,7 +83,7 @@ extern void __setSystemTime(unsigned long long sec, unsigned long us);
 #define SNTP_SERVER_DNS                   1
 
 #ifndef LWIP_DEBUG
-#define LWIP_DEBUG                  1
+#define LWIP_DEBUG                  0
 #endif
 #define ETHARP_DEBUG                (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
 #define NETIF_DEBUG                 (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)

libraries/lwIP_Ethernet/src/LwipEthernet.cpp

@@ -233,16 +233,18 @@ static void update_next_timeout(async_context_t *context, async_when_pending_wor
 // and polls all Ethernet interfaces
 static TaskHandle_t _ethernetTask;;
 
-static void stage2() {
-        // Scan the installed Ethernet drivers
-        for (auto handlePacket : _handlePacketList) {
-            // Note that each NIC needs to use its own mutex to ensure LWIP isn't doing something with it at the time we want to poll
-            handlePacket.second();
-        }
-        // Do LWIP stuff as needed
-        sys_check_timeouts();
+static void stage2(void *cbData) {
+    (void) cbData;
+    // Scan the installed Ethernet drivers
+    for (auto handlePacket : _handlePacketList) {
+        // Note that each NIC needs to use its own mutex to ensure LWIP isn't doing something with it at the time we want to poll
+        handlePacket.second();
+    }
+    // Do LWIP stuff as needed
+    sys_check_timeouts();
 }
-extern "C" void lwip_callback(void (*cb)());
+
+extern "C" void lwip_callback(void (*cb)(void *), void *cbData);
 static void ethernetTask(void *param) {
     (void) param;
     while (true) {
@@ -251,7 +253,7 @@ static void ethernetTask(void *param) {
             sleep_ms = _pollingPeriod;
         }
         vTaskDelay(sleep_ms / portTICK_PERIOD_MS);
-        lwip_callback(stage2);
+        lwip_callback(stage2, nullptr);
 #if 0
         // Scan the installed Ethernet drivers
         for (auto handlePacket : _handlePacketList) {