Minor LWIPEthernet cleanup (earlephilhower#1906)

earlephilhower · web-flow · commit 2aa85e32635b · 2023-12-20T07:49:48.000-08:00
diff --git a/libraries/lwIP_Ethernet/src/LwipEthernet.cpp b/libraries/lwIP_Ethernet/src/LwipEthernet.cpp
@@ -32,7 +32,6 @@ bool __ethernetContextInitted = false;
 // Async context that pumps the ethernet controllers
 static async_context_threadsafe_background_t lwip_ethernet_async_context_threadsafe_background;
 static async_at_time_worker_t ethernet_timeout_worker;
-
 static async_context_t *_context = nullptr;
 
 // Theoretically support multiple interfaces
@@ -45,7 +44,7 @@ void ethernet_arch_lwip_begin() {
         return;
     }
 #endif
-    async_context_acquire_lock_blocking(&lwip_ethernet_async_context_threadsafe_background.core);
+    async_context_acquire_lock_blocking(_context);
 }
 
 void ethernet_arch_lwip_end() {
@@ -55,7 +54,7 @@ void ethernet_arch_lwip_end() {
         return;
     }
 #endif
-    async_context_release_lock(&lwip_ethernet_async_context_threadsafe_background.core);
+    async_context_release_lock(_context);
 }
 
 int __addEthernetPacketHandler(std::function<void(void)> _packetHandler) {
diff --git a/libraries/lwIP_Ethernet/src/LwipIntfDev.h b/libraries/lwIP_Ethernet/src/LwipIntfDev.h
@@ -67,7 +67,7 @@ class LwipIntfDev: public LwipIntf, public RawDev {
                 const IPAddress& arg3 = IPADDR_NONE, const IPAddress& dns2 = IPADDR_NONE);
 
     // two and one parameter version. 2nd parameter is DNS like in Arduino. IPv4 only
-    boolean config(IPAddress local_ip, IPAddress dns = IPADDR_NONE);
+    bool config(IPAddress local_ip, IPAddress dns = IPADDR_NONE);
 
     // default mac-address is inferred from esp8266's STA interface
     bool begin(const uint8_t* macAddress = nullptr, const uint16_t mtu = DEFAULT_MTU);
@@ -271,7 +271,7 @@ bool LwipIntfDev<RawDev>::config(const IPAddress& localIP, const IPAddress& gate
 }
 
 template<class RawDev>
-boolean LwipIntfDev<RawDev>::config(IPAddress local_ip, IPAddress dns) {
+bool LwipIntfDev<RawDev>::config(IPAddress local_ip, IPAddress dns) {
 
     if (!local_ip.isSet()) {
         return config(INADDR_ANY, INADDR_ANY, INADDR_ANY);

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ bool __ethernetContextInitted = false;`
`32`	`32`	`// Async context that pumps the ethernet controllers`
`33`	`33`	`static async_context_threadsafe_background_t lwip_ethernet_async_context_threadsafe_background;`
`34`	`34`	`static async_at_time_worker_t ethernet_timeout_worker;`
`35`		`-`
`36`	`35`	`static async_context_t *_context = nullptr;`
`37`	`36`
`38`	`37`	`// Theoretically support multiple interfaces`
`@@ -45,7 +44,7 @@ void ethernet_arch_lwip_begin() {`
`45`	`44`	`return;`
`46`	`45`	`}`
`47`	`46`	`#endif`
`48`		`- async_context_acquire_lock_blocking(&lwip_ethernet_async_context_threadsafe_background.core);`
	`47`	`+ async_context_acquire_lock_blocking(_context);`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`void ethernet_arch_lwip_end() {`
`@@ -55,7 +54,7 @@ void ethernet_arch_lwip_end() {`
`55`	`54`	`return;`
`56`	`55`	`}`
`57`	`56`	`#endif`
`58`		`- async_context_release_lock(&lwip_ethernet_async_context_threadsafe_background.core);`
	`57`	`+ async_context_release_lock(_context);`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`int __addEthernetPacketHandler(std::function<void(void)> _packetHandler) {`