Wrap additional CYW43 functions (#3529)

Author: wgm4321

cores/rp2040/freertos/freertos-lwip.cpp

@@ -493,6 +493,16 @@ static void lwipThread(void *params) {
                 *(r->ret) = __real_cyw43_wifi_leave(r->self, r->itf);
                 break;
             }
+            case __cyw43_ioctl: {
+                __cyw43_ioctl_req *r = (__cyw43_ioctl_req *)w.req;
+                *(r->ret) = __real_cyw43_ioctl(r->self, r->cmd, r->len, r->buf, r->iface);
+                break;
+            }
+            case __cyw43_wifi_update_multicast_filter: {
+                __cyw43_wifi_update_multicast_filter_req *r = (__cyw43_wifi_update_multicast_filter_req *)w.req;
+                *(r->ret) = __real_cyw43_wifi_update_multicast_filter(r->self, r->addr, r->add);
+                break;
+            }
 #endif
             case __callback: {
                 __callback_req *r = (__callback_req *)w.req;

cores/rp2040/lwip_wrap.cpp

@@ -1130,6 +1130,32 @@ extern "C" {
 #endif
         return __real_cyw43_wifi_leave(self, itf);
     }
+
+    int __real_cyw43_ioctl(cyw43_t *self, uint32_t cmd, size_t len, uint8_t *buf, uint32_t iface);
+    int __wrap_cyw43_ioctl(cyw43_t *self, uint32_t cmd, size_t len, uint8_t *buf, uint32_t iface) {
+#ifdef __FREERTOS
+        if (!__isLWIPThread()) {
+            int ret;
+            __cyw43_ioctl_req req = { self, cmd, len, buf, iface, &ret };
+            __lwip(__cyw43_ioctl, &req);
+            return ret;
+        }
+#endif
+        return __real_cyw43_ioctl(self, cmd, len, buf, iface);
+    }
+
+    int __real_cyw43_wifi_update_multicast_filter(cyw43_t *self, uint8_t *addr, bool add);
+    int __wrap_cyw43_wifi_update_multicast_filter(cyw43_t *self, uint8_t *addr, bool add) {
+#ifdef __FREERTOS
+        if (!__isLWIPThread()) {
+            int ret;
+            __cyw43_wifi_update_multicast_filter_req req = { self, addr, add, &ret };
+            __lwip(__cyw43_wifi_update_multicast_filter, &req);
+            return ret;
+        }
+#endif
+        return __real_cyw43_wifi_update_multicast_filter(self, addr, add);
+    }
 #endif
 
 

cores/rp2040/lwip_wrap.h

@@ -181,6 +181,8 @@ typedef enum {
 #if defined(PICO_CYW43_SUPPORTED)
     __cyw43_wifi_join = 9500,
     __cyw43_wifi_leave,
+    __cyw43_ioctl,
+    __cyw43_wifi_update_multicast_filter,
 #endif
 
     __callback = 10000,
@@ -269,6 +271,8 @@ extern void __real_netif_set_default(struct netif *netif);
 extern err_t __real_ethernet_input(struct pbuf *p, struct netif *netif);
 extern int __real_cyw43_wifi_join(cyw43_t *self, size_t ssid_len, const uint8_t *ssid, size_t key_len, const uint8_t *key, uint32_t auth_type, const uint8_t *bssid, uint32_t channel);
 extern int __real_cyw43_wifi_leave(cyw43_t *self, int itf);
+extern int __real_cyw43_ioctl(cyw43_t *self, uint32_t cmd, size_t len, uint8_t *buf, uint32_t iface);
+extern int __real_cyw43_wifi_update_multicast_filter(cyw43_t *self, uint8_t *addr, bool add);
 
 
 typedef struct {
@@ -730,6 +734,22 @@ typedef struct {
     int itf;
     int *ret;
 } __cyw43_wifi_leave_req;
+
+typedef struct {
+    cyw43_t *self;
+    uint32_t cmd;
+    size_t len;
+    uint8_t *buf;
+    uint32_t iface;
+    int *ret;
+} __cyw43_ioctl_req;
+
+typedef struct {
+    cyw43_t *self;
+    uint8_t *addr;
+    bool add;
+    int *ret;
+} __cyw43_wifi_update_multicast_filter_req;
 #endif
 
 // Run a callback in the LWIP thread (i.e. for Ethernet device polling and packet reception)

lib/core_wrap.txt

@@ -115,5 +115,7 @@
 -Wl,--wrap=cyw43_schedule_internal_poll_dispatch
 -Wl,--wrap=cyw43_wifi_join
 -Wl,--wrap=cyw43_wifi_leave
+-Wl,--wrap=cyw43_ioctl
+-Wl,--wrap=cyw43_wifi_update_multicast_filter
 -Wl,--wrap=cyw43_arch_gpio_put
 -Wl,--wrap=btstack_run_loop_async_context_get_instance