Last remaining PICO_W hardcode checks

earlephilhower · earlephilhower · commit 086e57fc08e2 · 2024-11-15T13:03:29.000-08:00
diff --git a/cores/rp2040/RP2040Support.h b/cores/rp2040/RP2040Support.h
@@ -465,7 +465,7 @@ class RP2040 {
     }
 
     bool isPicoW() {
-#if !defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if !defined(PICO_CYW43_SUPPORTED)
         return false;
 #else
         extern bool __isPicoW;
diff --git a/cores/rp2040/lwip_wrap.cpp b/cores/rp2040/lwip_wrap.cpp
@@ -46,7 +46,7 @@ class LWIPMutex {
         if (ethernet_arch_lwip_gpio_mask)  {
             ethernet_arch_lwip_gpio_mask();
         }
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)
         if (rp2040.isPicoW()) {
             cyw43_arch_lwip_begin();
             return;
@@ -60,7 +60,7 @@ class LWIPMutex {
     }
 
     ~LWIPMutex() {
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)
         if (rp2040.isPicoW()) {
             cyw43_arch_lwip_end();
         } else {
@@ -70,7 +70,7 @@ class LWIPMutex {
             } else {
                 recursive_mutex_exit(&__lwipMutex);
             }
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)
         }
 #endif
         if (ethernet_arch_lwip_gpio_unmask) {

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ class RP2040 {`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`bool isPicoW() {`
`468`		`-#if !defined(ARDUINO_RASPBERRY_PI_PICO_W)`
	`468`	`+#if !defined(PICO_CYW43_SUPPORTED)`
`469`	`469`	`return false;`
`470`	`470`	`#else`
`471`	`471`	`extern bool __isPicoW;`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class LWIPMutex {`
`46`	`46`	`if (ethernet_arch_lwip_gpio_mask) {`
`47`	`47`	`ethernet_arch_lwip_gpio_mask();`
`48`	`48`	`}`
`49`		`-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)`
	`49`	`+#if defined(PICO_CYW43_SUPPORTED)`
`50`	`50`	`if (rp2040.isPicoW()) {`
`51`	`51`	`cyw43_arch_lwip_begin();`
`52`	`52`	`return;`
`@@ -60,7 +60,7 @@ class LWIPMutex {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`~LWIPMutex() {`
`63`		`-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)`
	`63`	`+#if defined(PICO_CYW43_SUPPORTED)`
`64`	`64`	`if (rp2040.isPicoW()) {`
`65`	`65`	`cyw43_arch_lwip_end();`
`66`	`66`	`} else {`
`@@ -70,7 +70,7 @@ class LWIPMutex {`
`70`	`70`	`} else {`
`71`	`71`	`recursive_mutex_exit(&__lwipMutex);`
`72`	`72`	`}`
`73`		`-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)`
	`73`	`+#if defined(PICO_CYW43_SUPPORTED)`
`74`	`74`	`}`
`75`	`75`	`#endif`
`76`	`76`	`if (ethernet_arch_lwip_gpio_unmask) {`