Fallthrough LWIP mutex on PicoW wired Ethernet (earlephilhower#1712)

earlephilhower · web-flow · commit f5e8e5b32535 · 2023-09-15T09:08:21.000-07:00
When built for the PicoW but run on a Pico (non-W), fall through to use
the wired Ethernet mutex instead of no mutex at all for LWIP protection.
diff --git a/cores/rp2040/lwip_wrap.cpp b/cores/rp2040/lwip_wrap.cpp
@@ -30,12 +30,10 @@
 #include <pico/mutex.h>
 #include <sys/lock.h>
 
-#if !defined(ARDUINO_RASPBERRY_PI_PICO_W)
 extern void ethernet_arch_lwip_begin() __attribute__((weak));
 extern void ethernet_arch_lwip_end() __attribute__((weak));
 
-auto_init_recursive_mutex(__lwipMutex); // Only for non-PicoW case
-#endif
+auto_init_recursive_mutex(__lwipMutex); // Only for case with no Ethernet or PicoW, but still doing LWIP (PPP?)
 
 class LWIPMutex {
 public:
@@ -45,13 +43,12 @@ class LWIPMutex {
             cyw43_arch_lwip_begin();
             return;
         }
-#else
+#endif
         if (ethernet_arch_lwip_begin) {
             ethernet_arch_lwip_begin();
         } else {
             recursive_mutex_enter_blocking(&__lwipMutex);
         }
-#endif
     }
 
     ~LWIPMutex() {
@@ -60,13 +57,12 @@ class LWIPMutex {
             cyw43_arch_lwip_end();
             return;
         }
-#else
+#endif
         if (ethernet_arch_lwip_end) {
             ethernet_arch_lwip_end();
         } else {
             recursive_mutex_exit(&__lwipMutex);
         }
-#endif
     }
 };
 
