diff --git a/examples/pico-sdk/pico-rmii/driver_rp2040_rmii.c b/examples/pico-sdk/pico-rmii/driver_rp2040_rmii.c
index a64fa2efc9..cc25246c32 100644
--- a/examples/pico-sdk/pico-rmii/driver_rp2040_rmii.c
+++ b/examples/pico-sdk/pico-rmii/driver_rp2040_rmii.c
@@ -320,7 +320,8 @@ static void rx_irq(void) {
   s_rxno = rxno;
 }
 
-static bool mg_tcpip_driver_rp2040_rmii_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_rp2040_rmii_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_rp2040_rmii_data *d =
       (struct mg_tcpip_driver_rp2040_rmii_data *) ifp->driver_data;
   uint32_t bsr =
@@ -332,5 +333,5 @@ struct mg_tcpip_driver mg_tcpip_driver_rp2040_rmii = {
     mg_tcpip_driver_rp2040_rmii_init,
     mg_tcpip_driver_rp2040_rmii_tx,
     NULL,
-    mg_tcpip_driver_rp2040_rmii_up,
+    mg_tcpip_driver_rp2040_rmii_poll,
 };
diff --git a/examples/pico-sdk/pico-rndis-dashboard/main.c b/examples/pico-sdk/pico-rndis-dashboard/main.c
index ab5fc83d40..574414c585 100644
--- a/examples/pico-sdk/pico-rndis-dashboard/main.c
+++ b/examples/pico-sdk/pico-rndis-dashboard/main.c
@@ -39,9 +39,10 @@ static size_t usb_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return len;
 }
 
-static bool usb_up(struct mg_tcpip_if *ifp) {
+static bool usb_poll(struct mg_tcpip_if *ifp, bool s1) {
   (void) ifp;
-  return tud_inited() && tud_ready() && tud_connected();
+  tud_task();
+  return s1 ? tud_inited() && tud_ready() && tud_connected() : false;
 }
 
 static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_dta) {
@@ -57,7 +58,7 @@ int main(void) {
   mg_mgr_init(&mgr);  // and attach it to the interface
   mg_timer_add(&mgr, 500, MG_TIMER_REPEAT, blink_cb, &mgr);
 
-  struct mg_tcpip_driver driver = {.tx = usb_tx, .up = usb_up};
+  struct mg_tcpip_driver driver = {.tx = usb_tx, .poll = usb_poll};
   struct mg_tcpip_if mif = {.mac = {2, 0, 1, 2, 3, 0x77},
                        .ip = mg_htonl(MG_U32(192, 168, 3, 1)),
                        .mask = mg_htonl(MG_U32(255, 255, 255, 0)),
@@ -74,7 +75,6 @@ int main(void) {
   MG_INFO(("Starting event loop"));
   for (;;) {
     mg_mgr_poll(&mgr, 0);
-    tud_task();
   }
 
   return 0;
diff --git a/examples/pico-sdk/pico-rndis-device/main.c b/examples/pico-sdk/pico-rndis-device/main.c
index 2d72cfd1a3..60510cb875 100644
--- a/examples/pico-sdk/pico-rndis-device/main.c
+++ b/examples/pico-sdk/pico-rndis-device/main.c
@@ -52,9 +52,10 @@ static size_t usb_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return len;
 }
 
-static bool usb_up(struct mg_tcpip_if *ifp) {
+static bool usb_poll(struct mg_tcpip_if *ifp, bool s1) {
   (void) ifp;
-  return tud_inited() && tud_ready() && tud_connected();
+  tud_task();
+  return s1 ? tud_inited() && tud_ready() && tud_connected() : false;
 }
 
 static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_dta) {
@@ -69,7 +70,7 @@ int main(void) {
   struct mg_mgr mgr;  // Initialise Mongoose event manager
   mg_mgr_init(&mgr);  // and attach it to the interface
 
-  struct mg_tcpip_driver driver = {.tx = usb_tx, .up = usb_up};
+  struct mg_tcpip_driver driver = {.tx = usb_tx, .poll = usb_poll};
   struct mg_tcpip_if mif = {.mac = {2, 0, 1, 2, 3, 0x77},
                             .ip = mg_htonl(MG_U32(192, 168, 3, 1)),
                             .mask = mg_htonl(MG_U32(255, 255, 255, 0)),
@@ -87,7 +88,6 @@ int main(void) {
   MG_INFO(("Starting event loop"));
   for (;;) {
     mg_mgr_poll(&mgr, 0);
-    tud_task();
   }
 
   return 0;
diff --git a/examples/stm32/nucleo-f429zi-make-baremetal-builtin-rndis/main.c b/examples/stm32/nucleo-f429zi-make-baremetal-builtin-rndis/main.c
index 74cadc70d9..e7cff96719 100644
--- a/examples/stm32/nucleo-f429zi-make-baremetal-builtin-rndis/main.c
+++ b/examples/stm32/nucleo-f429zi-make-baremetal-builtin-rndis/main.c
@@ -59,9 +59,10 @@ static size_t usb_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return len;
 }
 
-static bool usb_up(struct mg_tcpip_if *ifp) {
+static bool usb_poll(struct mg_tcpip_if *ifp, bool s1) {
   (void) ifp;
-  return tud_inited() && tud_ready() && tud_connected();
+  tud_task();
+  return s1 ? tud_inited() && tud_ready() && tud_connected() : false;
 }
 
 static void fn(struct mg_connection *c, int ev, void *ev_data) {
@@ -87,7 +88,7 @@ int main(void) {
 
 
   MG_INFO(("Init TCP/IP stack ..."));
-  struct mg_tcpip_driver driver = {.tx = usb_tx, .up = usb_up};
+  struct mg_tcpip_driver driver = {.tx = usb_tx, .poll = usb_poll};
   struct mg_tcpip_if mif = {.mac = GENERATE_LOCALLY_ADMINISTERED_MAC(),
                             .ip = mg_htonl(MG_U32(192, 168, 3, 1)),
                             .mask = mg_htonl(MG_U32(255, 255, 255, 0)),
@@ -106,7 +107,6 @@ int main(void) {
   MG_INFO(("Init done, starting main loop ..."));
   for (;;) {
     mg_mgr_poll(&mgr, 0);
-    tud_task();
   }
 
   return 0;
diff --git a/examples/stm32/nucleo-f746zg-make-baremetal-builtin-rndis/main.c b/examples/stm32/nucleo-f746zg-make-baremetal-builtin-rndis/main.c
index 74cadc70d9..e7cff96719 100644
--- a/examples/stm32/nucleo-f746zg-make-baremetal-builtin-rndis/main.c
+++ b/examples/stm32/nucleo-f746zg-make-baremetal-builtin-rndis/main.c
@@ -59,9 +59,10 @@ static size_t usb_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return len;
 }
 
-static bool usb_up(struct mg_tcpip_if *ifp) {
+static bool usb_poll(struct mg_tcpip_if *ifp, bool s1) {
   (void) ifp;
-  return tud_inited() && tud_ready() && tud_connected();
+  tud_task();
+  return s1 ? tud_inited() && tud_ready() && tud_connected() : false;
 }
 
 static void fn(struct mg_connection *c, int ev, void *ev_data) {
@@ -87,7 +88,7 @@ int main(void) {
 
 
   MG_INFO(("Init TCP/IP stack ..."));
-  struct mg_tcpip_driver driver = {.tx = usb_tx, .up = usb_up};
+  struct mg_tcpip_driver driver = {.tx = usb_tx, .poll = usb_poll};
   struct mg_tcpip_if mif = {.mac = GENERATE_LOCALLY_ADMINISTERED_MAC(),
                             .ip = mg_htonl(MG_U32(192, 168, 3, 1)),
                             .mask = mg_htonl(MG_U32(255, 255, 255, 0)),
@@ -106,7 +107,6 @@ int main(void) {
   MG_INFO(("Init done, starting main loop ..."));
   for (;;) {
     mg_mgr_poll(&mgr, 0);
-    tud_task();
   }
 
   return 0;
diff --git a/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/main.c b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/main.c
index d8974cd5f1..1d6c7e1def 100644
--- a/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/main.c
+++ b/examples/ti/ek-tm4c1294xl-make-baremetal-builtin-rndis/main.c
@@ -56,9 +56,10 @@ static size_t usb_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return len;
 }
 
-static bool usb_up(struct mg_tcpip_if *ifp) {
+static bool usb_poll(struct mg_tcpip_if *ifp, bool s1) {
   (void) ifp;
-  return tud_inited() && tud_ready() && tud_connected();
+  tud_task();
+  return s1 ? tud_inited() && tud_ready() && tud_connected() : false;
 }
 
 static void fn(struct mg_connection *c, int ev, void *ev_data) {
@@ -83,7 +84,7 @@ int main(void) {
   mg_log_set(MG_LL_DEBUG);  // Set log level
 
   MG_INFO(("Init TCP/IP stack ..."));
-  struct mg_tcpip_driver driver = {.tx = usb_tx, .up = usb_up};
+  struct mg_tcpip_driver driver = {.tx = usb_tx, .poll = usb_poll};
   struct mg_tcpip_if mif = {.mac = {2, 0, 1, 2, 3, 0x77},
                             .ip = mg_htonl(MG_U32(192, 168, 3, 1)),
                             .mask = mg_htonl(MG_U32(255, 255, 255, 0)),
@@ -121,7 +122,6 @@ int main(void) {
   MG_INFO(("Init done, starting main loop ..."));
   for (;;) {
     mg_mgr_poll(&mgr, 0);
-    tud_task();
   }
 
   return 0;
diff --git a/mongoose.c b/mongoose.c
index 32772391b5..4d450d4658 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -4994,24 +4994,27 @@ static void mg_tcpip_poll(struct mg_tcpip_if *ifp, uint64_t now) {
     ifp->state = MG_TCPIP_STATE_READY;  // keep best-effort MAC
     onstatechange(ifp);
   }
-  // Handle physical interface up/down status
-  if (expired_1000ms && ifp->driver->up) {
-    bool up = ifp->driver->up(ifp);
-    bool current = ifp->state != MG_TCPIP_STATE_DOWN;
-    if (!up && ifp->enable_dhcp_client) ifp->ip = 0;
-    if (up != current) {  // link state has changed
-      ifp->state = up == false ? MG_TCPIP_STATE_DOWN
-                   : ifp->enable_dhcp_client || ifp->ip == 0
-                       ? MG_TCPIP_STATE_UP
-                       : MG_TCPIP_STATE_IP;
-      onstatechange(ifp);
-    } else if (!ifp->enable_dhcp_client && ifp->state == MG_TCPIP_STATE_UP &&
-               ifp->ip) {
-      ifp->state = MG_TCPIP_STATE_IP;  // ifp->fn has set an IP
-      onstatechange(ifp);
+  // poll driver
+  if (ifp->driver->poll) {
+    bool up = ifp->driver->poll(ifp, expired_1000ms);
+    // Handle physical interface up/down status
+    if (expired_1000ms) {
+      bool current = ifp->state != MG_TCPIP_STATE_DOWN;
+      if (!up && ifp->enable_dhcp_client) ifp->ip = 0;
+      if (up != current) {  // link state has changed
+        ifp->state = up == false ? MG_TCPIP_STATE_DOWN
+                     : ifp->enable_dhcp_client || ifp->ip == 0
+                         ? MG_TCPIP_STATE_UP
+                         : MG_TCPIP_STATE_IP;
+        onstatechange(ifp);
+      } else if (!ifp->enable_dhcp_client && ifp->state == MG_TCPIP_STATE_UP &&
+                 ifp->ip) {
+        ifp->state = MG_TCPIP_STATE_IP;  // ifp->fn has set an IP
+        onstatechange(ifp);
+      }
+      if (ifp->state == MG_TCPIP_STATE_DOWN) MG_ERROR(("Network is down"));
+      mg_tcpip_call(ifp, MG_TCPIP_EV_TIMER_1S, NULL);
     }
-    if (ifp->state == MG_TCPIP_STATE_DOWN) MG_ERROR(("Network is down"));
-    mg_tcpip_call(ifp, MG_TCPIP_EV_TIMER_1S, NULL);
   }
   if (ifp->state == MG_TCPIP_STATE_DOWN) return;
 
@@ -5033,14 +5036,14 @@ static void mg_tcpip_poll(struct mg_tcpip_if *ifp, uint64_t now) {
   }
 
   // Read data from the network
-  if (ifp->driver->rx != NULL) {  // Polling driver. We must call it
+  if (ifp->driver->rx != NULL) {  // Simple polling driver, returns one frame
     size_t len =
         ifp->driver->rx(ifp->recv_queue.buf, ifp->recv_queue.size, ifp);
     if (len > 0) {
       ifp->nrecv++;
       mg_tcpip_rx(ifp, ifp->recv_queue.buf, len);
     }
-  } else {  // Interrupt-based driver. Fills recv queue itself
+  } else {  // Complex poll / Interrupt-based driver. Queues recvd frames
     char *buf;
     size_t len = mg_queue_next(&ifp->recv_queue, &buf);
     if (len > 0) {
@@ -17358,12 +17361,12 @@ static struct mg_tcpip_if *s_ifp;
 
 static void mac_cb(uint32_t);
 static bool cmsis_init(struct mg_tcpip_if *);
-static bool cmsis_up(struct mg_tcpip_if *);
+static bool cmsis_poll(struct mg_tcpip_if *, bool);
 static size_t cmsis_tx(const void *, size_t, struct mg_tcpip_if *);
 static size_t cmsis_rx(void *, size_t, struct mg_tcpip_if *);
 
 struct mg_tcpip_driver mg_tcpip_driver_cmsis = {cmsis_init, cmsis_tx, NULL,
-                                                cmsis_up};
+                                                cmsis_poll};
 
 static bool cmsis_init(struct mg_tcpip_if *ifp) {
   ARM_ETH_MAC_ADDR addr;
@@ -17401,7 +17404,8 @@ static size_t cmsis_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return len;
 }
 
-static bool cmsis_up(struct mg_tcpip_if *ifp) {
+static bool cmsis_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   ARM_DRIVER_ETH_PHY *phy = &Driver_ETH_PHY0;
   ARM_DRIVER_ETH_MAC *mac = &Driver_ETH_MAC0;
   bool up = (phy->GetLinkState() == ARM_ETH_LINK_UP) ? 1 : 0;  // link state
@@ -17605,7 +17609,8 @@ static size_t mg_tcpip_driver_imxrt_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_imxrt_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_imxrt_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_imxrt_data *d =
       (struct mg_tcpip_driver_imxrt_data *) ifp->driver_data;
   uint8_t speed = MG_PHY_SPEED_10M;
@@ -17651,7 +17656,7 @@ void ENET_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_imxrt = {mg_tcpip_driver_imxrt_init,
                                                 mg_tcpip_driver_imxrt_tx, NULL,
-                                                mg_tcpip_driver_imxrt_up};
+                                                mg_tcpip_driver_imxrt_poll};
 
 #endif
 
@@ -17817,12 +17822,19 @@ static bool mg_tcpip_driver_pico_w_init(struct mg_tcpip_if *ifp) {
   s_ifp = ifp;
   if (cyw43_arch_init() != 0)
     return false;  // initialize async_context and WiFi chip
-  cyw43_arch_enable_sta_mode();
-  // start connecting to network
-  if (cyw43_arch_wifi_connect_bssid_async(d->ssid, NULL, d->pass,
-                                          CYW43_AUTH_WPA2_AES_PSK) != 0)
-    return false;
-  cyw43_wifi_get_mac(&cyw43_state, CYW43_ITF_STA, ifp->mac);
+  if (d->apmode && d->apssid != NULL){
+    MG_DEBUG(("Starting AP '%s' (%u)", d->apssid, d->apchannel));
+    cyw43_wifi_ap_set_channel(&cyw43_state, d->apchannel);
+    cyw43_arch_enable_ap_mode(d->apssid, d->appass, CYW43_AUTH_WPA2_AES_PSK);
+    cyw43_wifi_get_mac(&cyw43_state, CYW43_ITF_STA, ifp->mac);
+  } else {
+    cyw43_arch_enable_sta_mode();
+    cyw43_wifi_get_mac(&cyw43_state, CYW43_ITF_AP, ifp->mac);
+    if (d->ssid != NULL && d->pass != NULL) {
+      MG_DEBUG(("Connecting to '%s'", d->ssid));
+      return (cyw43_arch_wifi_connect_bssid_async(d->ssid, NULL, d->pass, CYW43_AUTH_WPA2_AES_PSK) == 0);
+    }
+  }
   return true;
 }
 
@@ -17834,17 +17846,19 @@ static size_t mg_tcpip_driver_pico_w_tx(const void *buf, size_t len,
              : len;
 }
 
-static bool mg_tcpip_driver_pico_w_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_pico_w_poll(struct mg_tcpip_if *ifp, bool s1) {
   (void) ifp;
-  return (cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA) ==
-          CYW43_LINK_JOIN);
+  cyw43_arch_poll(); // not necessary, except when IRQs are disabled (OTA)
+  return s1 ? (cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA) ==
+               CYW43_LINK_JOIN)
+            : false;
 }
 
 struct mg_tcpip_driver mg_tcpip_driver_pico_w = {
     mg_tcpip_driver_pico_w_init,
     mg_tcpip_driver_pico_w_tx,
     NULL,
-    mg_tcpip_driver_pico_w_up,
+    mg_tcpip_driver_pico_w_poll,
 };
 
 // Called once per outstanding frame by async_context
@@ -17856,11 +17870,15 @@ void cyw43_cb_process_ethernet(void *cb_data, int itf, size_t len,
 }
 
 // Called by async_context
-void cyw43_cb_tcpip_set_link_up(cyw43_t *self, int itf) {}
-void cyw43_cb_tcpip_set_link_down(cyw43_t *self, int itf) {}
+void cyw43_cb_tcpip_set_link_up(cyw43_t *self, int itf) {
+}
+void cyw43_cb_tcpip_set_link_down(cyw43_t *self, int itf) {
+}
 
 // there's life beyond lwIP
-void pbuf_copy_partial(void) {(void) 0;}
+void pbuf_copy_partial(void) {
+  (void) 0;
+}
 
 #endif
 
@@ -17965,7 +17983,8 @@ static uint32_t fcs_do(uint32_t fcs, uint8_t x) {
   return fcs;
 }
 
-static bool mg_ppp_up(struct mg_tcpip_if *ifp) {
+static bool mg_ppp_poll(struct mg_tcpip_if *ifp, bool s1) {
+  (void) s1;
   return ifp->driver_data != NULL;
 }
 
@@ -18398,7 +18417,8 @@ static size_t mg_tcpip_driver_ra_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_ra_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_ra_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_ra_data *d =
       (struct mg_tcpip_driver_ra_data *) ifp->driver_data;
   uint8_t speed = MG_PHY_SPEED_10M;
@@ -18445,7 +18465,7 @@ void EDMAC_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_ra = {mg_tcpip_driver_ra_init,
                                              mg_tcpip_driver_ra_tx, NULL,
-                                             mg_tcpip_driver_ra_up};
+                                             mg_tcpip_driver_ra_poll};
 
 #endif
 
@@ -18454,7 +18474,8 @@ struct mg_tcpip_driver mg_tcpip_driver_ra = {mg_tcpip_driver_ra_init,
 #endif
 
 
-#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_SAME54) && MG_ENABLE_DRIVER_SAME54
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_SAME54) && \
+    MG_ENABLE_DRIVER_SAME54
 
 #include <sam.h>
 
@@ -18618,21 +18639,22 @@ static size_t mg_tcpip_driver_same54_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_same54_up(struct mg_tcpip_if *ifp) {
-  uint16_t bsr = eth_read_phy(MG_PHY_ADDR, MG_PHYREG_BSR);
-  bool up = bsr & MG_PHYREGBIT_BSR_LINK_STATUS ? 1 : 0;
+static bool mg_tcpip_driver_same54_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (s1) {
+    uint16_t bsr = eth_read_phy(MG_PHY_ADDR, MG_PHYREG_BSR);
+    bool up = bsr & MG_PHYREGBIT_BSR_LINK_STATUS ? 1 : 0;
 
-  // If PHY is ready, update NCFGR accordingly
-  if (ifp->state == MG_TCPIP_STATE_DOWN && up) {
-    uint16_t bcr = eth_read_phy(MG_PHY_ADDR, MG_PHYREG_BCR);
-    bool fd = bcr & MG_PHYREGBIT_BCR_DUPLEX_MODE ? 1 : 0;
-    bool spd = bcr & MG_PHYREGBIT_BCR_SPEED ? 1 : 0;
-    GMAC_REGS->GMAC_NCFGR = (GMAC_REGS->GMAC_NCFGR &
-                             ~(GMAC_NCFGR_SPD_Msk | MG_PHYREGBIT_BCR_SPEED)) |
-                            GMAC_NCFGR_SPD(spd) | GMAC_NCFGR_FD(fd);
+    // If PHY is ready, update NCFGR accordingly
+    if (ifp->state == MG_TCPIP_STATE_DOWN && up) {
+      uint16_t bcr = eth_read_phy(MG_PHY_ADDR, MG_PHYREG_BCR);
+      bool fd = bcr & MG_PHYREGBIT_BCR_DUPLEX_MODE ? 1 : 0;
+      bool spd = bcr & MG_PHYREGBIT_BCR_SPEED ? 1 : 0;
+      GMAC_REGS->GMAC_NCFGR = (GMAC_REGS->GMAC_NCFGR &
+                               ~(GMAC_NCFGR_SPD_Msk | MG_PHYREGBIT_BCR_SPEED)) |
+                              GMAC_NCFGR_SPD(spd) | GMAC_NCFGR_FD(fd);
+    }
   }
-
-  return up;
+  return false;
 }
 
 void GMAC_Handler(void);
@@ -18665,7 +18687,7 @@ void GMAC_Handler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_same54 = {
     mg_tcpip_driver_same54_init, mg_tcpip_driver_same54_tx, NULL,
-    mg_tcpip_driver_same54_up};
+    mg_tcpip_driver_same54_poll};
 #endif
 
 #ifdef MG_ENABLE_LINES
@@ -18851,7 +18873,8 @@ static size_t mg_tcpip_driver_stm32f_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_stm32f_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_stm32f_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_stm32f_data *d =
       (struct mg_tcpip_driver_stm32f_data *) ifp->driver_data;
   uint8_t phy_addr = d == NULL ? 0 : d->phy_addr;
@@ -18902,7 +18925,7 @@ void ETH_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_stm32f = {
     mg_tcpip_driver_stm32f_init, mg_tcpip_driver_stm32f_tx, NULL,
-    mg_tcpip_driver_stm32f_up};
+    mg_tcpip_driver_stm32f_poll};
 #endif
 
 #ifdef MG_ENABLE_LINES
@@ -19078,7 +19101,8 @@ static size_t mg_tcpip_driver_stm32h_tx(const void *buf, size_t len,
   (void) ifp;
 }
 
-static bool mg_tcpip_driver_stm32h_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_stm32h_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_stm32h_data *d =
       (struct mg_tcpip_driver_stm32h_data *) ifp->driver_data;
   uint8_t phy_addr = d == NULL ? 0 : d->phy_addr;
@@ -19133,7 +19157,7 @@ void ETH_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_stm32h = {
     mg_tcpip_driver_stm32h_init, mg_tcpip_driver_stm32h_tx, NULL,
-    mg_tcpip_driver_stm32h_up};
+    mg_tcpip_driver_stm32h_poll};
 #endif
 
 #ifdef MG_ENABLE_LINES
@@ -19346,7 +19370,8 @@ static size_t mg_tcpip_driver_tm4c_tx(const void *buf, size_t len,
   (void) ifp;
 }
 
-static bool mg_tcpip_driver_tm4c_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_tm4c_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   uint32_t bmsr = emac_read_phy(EPHY_ADDR, EPHYBMSR);
   bool up = (bmsr & MG_BIT(2)) ? 1 : 0;
   if ((ifp->state == MG_TCPIP_STATE_DOWN) && up) {  // link state just went up
@@ -19388,7 +19413,7 @@ void EMAC0_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_tm4c = {mg_tcpip_driver_tm4c_init,
                                                mg_tcpip_driver_tm4c_tx, NULL,
-                                               mg_tcpip_driver_tm4c_up};
+                                               mg_tcpip_driver_tm4c_poll};
 #endif
 
 #ifdef MG_ENABLE_LINES
@@ -19568,12 +19593,13 @@ static size_t mg_tcpip_driver_tms570_tx(const void *buf, size_t len,
   return len;
   (void) ifp;
 }
-static bool mg_tcpip_driver_tms570_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_tms570_poll(struct mg_tcpip_if *ifp, bool s1) {
   struct mg_tcpip_driver_tms570_data *d =
       (struct mg_tcpip_driver_tms570_data *) ifp->driver_data;
   uint8_t speed = MG_PHY_SPEED_10M;
   bool up = false, full_duplex = false;
   struct mg_phy phy = {emac_read_phy, emac_write_phy};
+  if (!s1) return false;
   up = mg_phy_up(&phy, d->phy_addr, &full_duplex, &speed);
   if ((ifp->state == MG_TCPIP_STATE_DOWN) && up) {
     // link state just went up
@@ -19624,7 +19650,7 @@ void EMAC_RX_IRQHandler(void) {
 }
 struct mg_tcpip_driver mg_tcpip_driver_tms570 = {mg_tcpip_driver_tms570_init,
                                                mg_tcpip_driver_tms570_tx, NULL,
-                                               mg_tcpip_driver_tms570_up};
+                                               mg_tcpip_driver_tms570_poll};
 #endif
 
 
@@ -19635,8 +19661,8 @@ struct mg_tcpip_driver mg_tcpip_driver_tms570 = {mg_tcpip_driver_tms570_init,
 
 #if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_W5100) && MG_ENABLE_DRIVER_W5100
 
-static void w5100_txn(struct mg_tcpip_spi *s, uint16_t addr,
-                      bool wr, void *buf, size_t len) {
+static void w5100_txn(struct mg_tcpip_spi *s, uint16_t addr, bool wr, void *buf,
+                      size_t len) {
   size_t i;
   uint8_t *p = (uint8_t *) buf;
   uint8_t control = wr ? 0xF0 : 0x0F;
@@ -19661,8 +19687,8 @@ static  uint16_t w5100_r2(struct mg_tcpip_spi *s, uint16_t addr) { uint8_t buf[2
 
 static size_t w5100_rx(void *buf, size_t buflen, struct mg_tcpip_if *ifp) {
   struct mg_tcpip_spi *s = (struct mg_tcpip_spi *) ifp->driver_data;
-  uint16_t r = 0, n = 0, len = (uint16_t) buflen, n2;     // Read recv len
-  while ((n2 = w5100_r2(s, 0x426)) > n) n = n2;  // Until it is stable
+  uint16_t r = 0, n = 0, len = (uint16_t) buflen, n2;  // Read recv len
+  while ((n2 = w5100_r2(s, 0x426)) > n) n = n2;        // Until it is stable
   if (n > 0) {
     uint16_t ptr = w5100_r2(s, 0x428);  // Get read pointer
     if (n <= len + 2 && n > 1) {
@@ -19679,7 +19705,7 @@ static size_t w5100_rx(void *buf, size_t buflen, struct mg_tcpip_if *ifp) {
       w5100_rn(s, rxbuf_addr, buf + remaining_len, n - remaining_len);
     }
     w5100_w2(s, 0x428, (uint16_t) (ptr + n));
-    w5100_w1(s, 0x401, 0x40);                     // Sock0 CR -> RECV
+    w5100_w1(s, 0x401, 0x40);  // Sock0 CR -> RECV
   }
   return r;
 }
@@ -19688,27 +19714,27 @@ static size_t w5100_tx(const void *buf, size_t buflen,
                        struct mg_tcpip_if *ifp) {
   struct mg_tcpip_spi *s = (struct mg_tcpip_spi *) ifp->driver_data;
   uint16_t i, n = 0, ptr = 0, len = (uint16_t) buflen;
-  while (n < len) n = w5100_r2(s, 0x420);      // Wait for space
-  ptr = w5100_r2(s, 0x424);                    // Get write pointer
+  while (n < len) n = w5100_r2(s, 0x420);  // Wait for space
+  ptr = w5100_r2(s, 0x424);                // Get write pointer
   uint16_t txbuf_size = (1 << (w5100_r1(s, 0x1b) & 3)) * 1024;
   uint16_t ptr_ofs = ptr & (txbuf_size - 1);
   uint16_t txbuf_addr = 0x4000;
   if (ptr_ofs + len > txbuf_size) {
     uint16_t size = txbuf_size - ptr_ofs;
-    w5100_wn(s, txbuf_addr + ptr_ofs, (char*) buf, size);
-    w5100_wn(s, txbuf_addr, (char*) buf + size, len - size);
+    w5100_wn(s, txbuf_addr + ptr_ofs, (char *) buf, size);
+    w5100_wn(s, txbuf_addr, (char *) buf + size, len - size);
   } else {
-    w5100_wn(s, txbuf_addr + ptr_ofs, (char*) buf, len);
+    w5100_wn(s, txbuf_addr + ptr_ofs, (char *) buf, len);
   }
   w5100_w2(s, 0x424, (uint16_t) (ptr + len));  // Advance write pointer
-  w5100_w1(s, 0x401, 0x20);                       // Sock0 CR -> SEND
+  w5100_w1(s, 0x401, 0x20);                    // Sock0 CR -> SEND
   for (i = 0; i < 40; i++) {
     uint8_t ir = w5100_r1(s, 0x402);  // Read S0 IR
     if (ir == 0) continue;
     // printf("IR %d, len=%d, free=%d, ptr %d\n", ir, (int) len, (int) n, ptr);
-    w5100_w1(s, 0x402, ir);  // Write S0 IR: clear it!
-    if (ir & 8) len = 0;           // Timeout. Report error
-    if (ir & (16 | 8)) break;      // Stop on SEND_OK or timeout
+    w5100_w1(s, 0x402, ir);    // Write S0 IR: clear it!
+    if (ir & 8) len = 0;       // Timeout. Report error
+    if (ir & (16 | 8)) break;  // Stop on SEND_OK or timeout
   }
   return len;
 }
@@ -19716,26 +19742,26 @@ static size_t w5100_tx(const void *buf, size_t buflen,
 static bool w5100_init(struct mg_tcpip_if *ifp) {
   struct mg_tcpip_spi *s = (struct mg_tcpip_spi *) ifp->driver_data;
   s->end(s->spi);
-  w5100_w1(s, 0, 0x80);     // Reset chip: CR -> 0x80
-  w5100_w1(s, 0x72, 0x53);  // CR PHYLCKR -> unlock PHY
-  w5100_w1(s, 0x46, 0);     // CR PHYCR0 -> autonegotiation
-  w5100_w1(s, 0x47, 0);     // CR PHYCR1 -> reset
-  w5100_w1(s, 0x72, 0x00);  // CR PHYLCKR -> lock PHY
-  w5100_w1(s, 0x1a, 6);          // Sock0 RX buf size - 4KB
-  w5100_w1(s, 0x1b, 6);          // Sock0 TX buf size - 4KB
+  w5100_w1(s, 0, 0x80);               // Reset chip: CR -> 0x80
+  w5100_w1(s, 0x72, 0x53);            // CR PHYLCKR -> unlock PHY
+  w5100_w1(s, 0x46, 0);               // CR PHYCR0 -> autonegotiation
+  w5100_w1(s, 0x47, 0);               // CR PHYCR1 -> reset
+  w5100_w1(s, 0x72, 0x00);            // CR PHYLCKR -> lock PHY
+  w5100_w1(s, 0x1a, 6);               // Sock0 RX buf size - 4KB
+  w5100_w1(s, 0x1b, 6);               // Sock0 TX buf size - 4KB
   w5100_w1(s, 0x400, 4);              // Sock0 MR -> MACRAW
   w5100_w1(s, 0x401, 1);              // Sock0 CR -> OPEN
   return w5100_r1(s, 0x403) == 0x42;  // Sock0 SR == MACRAW
 }
 
-static bool w5100_up(struct mg_tcpip_if *ifp) {
+static bool w5100_poll(struct mg_tcpip_if *ifp, bool s1) {
   struct mg_tcpip_spi *spi = (struct mg_tcpip_spi *) ifp->driver_data;
-  uint8_t physr0 = w5100_r1(spi, 0x3c);
-  return physr0 & 1;  // Bit 0 of PHYSR is LNK (0 - down, 1 - up)
+  return s1 ? w5100_r1(spi, 0x3c /* PHYSR */) & 1
+            : false;  // Bit 0 of PHYSR is LNK (0 - down, 1 - up)
 }
 
 struct mg_tcpip_driver mg_tcpip_driver_w5100 = {w5100_init, w5100_tx, w5100_rx,
-                                                w5100_up};
+                                                w5100_poll};
 #endif
 
 #ifdef MG_ENABLE_LINES
@@ -19824,14 +19850,14 @@ static bool w5500_init(struct mg_tcpip_if *ifp) {
   return w5500_r1(s, W5500_S0, 3) == 0x42;  // Sock0 SR == MACRAW
 }
 
-static bool w5500_up(struct mg_tcpip_if *ifp) {
+static bool w5500_poll(struct mg_tcpip_if *ifp, bool s1) {
   struct mg_tcpip_spi *spi = (struct mg_tcpip_spi *) ifp->driver_data;
-  uint8_t phycfgr = w5500_r1(spi, W5500_CR, 0x2e);
-  return phycfgr & 1;  // Bit 0 of PHYCFGR is LNK (0 - down, 1 - up)
+  return s1 ? w5500_r1(spi, W5500_CR, 0x2e /* PHYCFGR */) & 1
+            : false;  // Bit 0 of PHYCFGR is LNK (0 - down, 1 - up)
 }
 
 struct mg_tcpip_driver mg_tcpip_driver_w5500 = {w5500_init, w5500_tx, w5500_rx,
-                                                w5500_up};
+                                                w5500_poll};
 #endif
 
 #ifdef MG_ENABLE_LINES
@@ -20018,7 +20044,8 @@ static size_t mg_tcpip_driver_xmc_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_xmc_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_xmc_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_xmc_data *d =
       (struct mg_tcpip_driver_xmc_data *) ifp->driver_data;
   uint8_t speed = MG_PHY_SPEED_10M;
@@ -20065,7 +20092,7 @@ void ETH0_0_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_xmc = {
     mg_tcpip_driver_xmc_init, mg_tcpip_driver_xmc_tx, NULL,
-    mg_tcpip_driver_xmc_up};
+    mg_tcpip_driver_xmc_poll};
 #endif
 
 #ifdef MG_ENABLE_LINES
@@ -20254,7 +20281,8 @@ static size_t mg_tcpip_driver_xmc7_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_xmc7_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_xmc7_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_xmc7_data *d =
       (struct mg_tcpip_driver_xmc7_data *) ifp->driver_data;
   uint8_t speed = MG_PHY_SPEED_10M;
@@ -20307,5 +20335,5 @@ void ETH_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_xmc7 = {mg_tcpip_driver_xmc7_init,
                                                mg_tcpip_driver_xmc7_tx, NULL,
-                                               mg_tcpip_driver_xmc7_up};
+                                               mg_tcpip_driver_xmc7_poll};
 #endif
diff --git a/mongoose.h b/mongoose.h
index 62a807d842..e269a55bdd 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -2717,21 +2717,42 @@ struct mg_tcpip_driver {
   bool (*init)(struct mg_tcpip_if *);                         // Init driver
   size_t (*tx)(const void *, size_t, struct mg_tcpip_if *);   // Transmit frame
   size_t (*rx)(void *buf, size_t len, struct mg_tcpip_if *);  // Receive frame
-  bool (*up)(struct mg_tcpip_if *);                           // Up/down status
+  bool (*poll)(struct mg_tcpip_if *, bool);  // Poll, return Up/down status
 };
 
 typedef void (*mg_tcpip_event_handler_t)(struct mg_tcpip_if *ifp, int ev,
                                          void *ev_data);
 
 enum {
-  MG_TCPIP_EV_ST_CHG,     // state change             uint8_t * (&ifp->state)
-  MG_TCPIP_EV_DHCP_DNS,   // DHCP DNS assignment      uint32_t *ipaddr
-  MG_TCPIP_EV_DHCP_SNTP,  // DHCP SNTP assignment     uint32_t *ipaddr
-  MG_TCPIP_EV_ARP,        // Got ARP packet           struct mg_str *
-  MG_TCPIP_EV_TIMER_1S,   // 1 second timer           NULL
-  MG_TCPIP_EV_USER        // Starting ID for user events
+  MG_TCPIP_EV_ST_CHG,           // state change                   uint8_t * (&ifp->state)
+  MG_TCPIP_EV_DHCP_DNS,         // DHCP DNS assignment            uint32_t *ipaddr
+  MG_TCPIP_EV_DHCP_SNTP,        // DHCP SNTP assignment           uint32_t *ipaddr
+  MG_TCPIP_EV_ARP,              // Got ARP packet                 struct mg_str *
+  MG_TCPIP_EV_TIMER_1S,         // 1 second timer                 NULL
+  MG_TCPIP_EV_WIFI_SCAN_RESULT, // Wi-Fi scan results             struct mg_wifi_scan_bss_data *
+  MG_TCPIP_EV_WIFI_SCAN_END,    // Wi-Fi scan has finished        NULL
+  MG_TCPIP_EV_WIFI_CONNECT_ERR, // Wi-Fi connect has failed       chip specific
+  MG_TCPIP_EV_USER              // Starting ID for user events
 };
 
+struct mg_wifi_scan_bss_data {
+    struct mg_str SSID;
+    char *BSSID;
+    int16_t RSSI;
+    uint8_t security;
+#define MG_WIFI_SECURITY_OPEN 0
+#define MG_WIFI_SECURITY_WEP  MG_BIT(0)
+#define MG_WIFI_SECURITY_WPA  MG_BIT(1)
+#define MG_WIFI_SECURITY_WPA2 MG_BIT(2)
+#define MG_WIFI_SECURITY_WPA3 MG_BIT(3)
+    uint8_t channel;
+    unsigned band :2;
+#define MG_WIFI_BAND_2G 0
+#define MG_WIFI_BAND_5G 1
+    unsigned has_n :1;
+};
+
+
 // Network interface
 struct mg_tcpip_if {
   uint8_t mac[6];                  // MAC address. Must be set to a valid MAC
@@ -2958,13 +2979,19 @@ bool mg_phy_up(struct mg_phy *, uint8_t addr, bool *full_duplex,
 struct mg_tcpip_driver_pico_w_data {
   char *ssid;
   char *pass;
+  char *apssid;
+  char *appass;
+  uint8_t security; // TBD
+  uint8_t apsecurity; // TBD
+  uint8_t apchannel;
+  bool apmode;      // start in AP mode; 'false' starts connection to 'ssid' if not NULL
 };
 
 #define MG_TCPIP_DRIVER_INIT(mgr)                                 \
   do {                                                            \
     static struct mg_tcpip_driver_pico_w_data driver_data_;       \
     static struct mg_tcpip_if mif_;                               \
-    MG_SET_WIFI_CREDS(&driver_data_.ssid, &driver_data_.pass);    \
+    MG_SET_WIFI_CONFIG(&driver_data_);                            \
     mif_.ip = MG_TCPIP_IP;                                        \
     mif_.mask = MG_TCPIP_MASK;                                    \
     mif_.gw = MG_TCPIP_GW;                                        \
diff --git a/src/drivers/cmsis.c b/src/drivers/cmsis.c
index 9a881d26bb..8c936c1cca 100644
--- a/src/drivers/cmsis.c
+++ b/src/drivers/cmsis.c
@@ -13,12 +13,12 @@ static struct mg_tcpip_if *s_ifp;
 
 static void mac_cb(uint32_t);
 static bool cmsis_init(struct mg_tcpip_if *);
-static bool cmsis_up(struct mg_tcpip_if *);
+static bool cmsis_poll(struct mg_tcpip_if *, bool);
 static size_t cmsis_tx(const void *, size_t, struct mg_tcpip_if *);
 static size_t cmsis_rx(void *, size_t, struct mg_tcpip_if *);
 
 struct mg_tcpip_driver mg_tcpip_driver_cmsis = {cmsis_init, cmsis_tx, NULL,
-                                                cmsis_up};
+                                                cmsis_poll};
 
 static bool cmsis_init(struct mg_tcpip_if *ifp) {
   ARM_ETH_MAC_ADDR addr;
@@ -56,7 +56,8 @@ static size_t cmsis_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return len;
 }
 
-static bool cmsis_up(struct mg_tcpip_if *ifp) {
+static bool cmsis_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   ARM_DRIVER_ETH_PHY *phy = &Driver_ETH_PHY0;
   ARM_DRIVER_ETH_MAC *mac = &Driver_ETH_MAC0;
   bool up = (phy->GetLinkState() == ARM_ETH_LINK_UP) ? 1 : 0;  // link state
diff --git a/src/drivers/imxrt.c b/src/drivers/imxrt.c
index 35235c1c2c..b8ba6f4e32 100644
--- a/src/drivers/imxrt.c
+++ b/src/drivers/imxrt.c
@@ -142,7 +142,8 @@ static size_t mg_tcpip_driver_imxrt_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_imxrt_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_imxrt_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_imxrt_data *d =
       (struct mg_tcpip_driver_imxrt_data *) ifp->driver_data;
   uint8_t speed = MG_PHY_SPEED_10M;
@@ -188,6 +189,6 @@ void ENET_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_imxrt = {mg_tcpip_driver_imxrt_init,
                                                 mg_tcpip_driver_imxrt_tx, NULL,
-                                                mg_tcpip_driver_imxrt_up};
+                                                mg_tcpip_driver_imxrt_poll};
 
 #endif
diff --git a/src/drivers/pico-w.c b/src/drivers/pico-w.c
index fdcca98c7f..2a340d21a9 100644
--- a/src/drivers/pico-w.c
+++ b/src/drivers/pico-w.c
@@ -1,8 +1,8 @@
 #if MG_ENABLE_TCPIP && MG_ARCH == MG_ARCH_PICOSDK && \
     defined(MG_ENABLE_DRIVER_PICO_W) && MG_ENABLE_DRIVER_PICO_W
 
-#include "net_builtin.h"
 #include "drivers/pico-w.h"
+#include "net_builtin.h"
 #include "pico/stdlib.h"
 
 static struct mg_tcpip_if *s_ifp;
@@ -13,12 +13,19 @@ static bool mg_tcpip_driver_pico_w_init(struct mg_tcpip_if *ifp) {
   s_ifp = ifp;
   if (cyw43_arch_init() != 0)
     return false;  // initialize async_context and WiFi chip
-  cyw43_arch_enable_sta_mode();
-  // start connecting to network
-  if (cyw43_arch_wifi_connect_bssid_async(d->ssid, NULL, d->pass,
-                                          CYW43_AUTH_WPA2_AES_PSK) != 0)
-    return false;
-  cyw43_wifi_get_mac(&cyw43_state, CYW43_ITF_STA, ifp->mac);
+  if (d->apmode && d->apssid != NULL){
+    MG_DEBUG(("Starting AP '%s' (%u)", d->apssid, d->apchannel));
+    cyw43_wifi_ap_set_channel(&cyw43_state, d->apchannel);
+    cyw43_arch_enable_ap_mode(d->apssid, d->appass, CYW43_AUTH_WPA2_AES_PSK);
+    cyw43_wifi_get_mac(&cyw43_state, CYW43_ITF_STA, ifp->mac);
+  } else {
+    cyw43_arch_enable_sta_mode();
+    cyw43_wifi_get_mac(&cyw43_state, CYW43_ITF_AP, ifp->mac);
+    if (d->ssid != NULL && d->pass != NULL) {
+      MG_DEBUG(("Connecting to '%s'", d->ssid));
+      return (cyw43_arch_wifi_connect_bssid_async(d->ssid, NULL, d->pass, CYW43_AUTH_WPA2_AES_PSK) == 0);
+    }
+  }
   return true;
 }
 
@@ -30,17 +37,19 @@ static size_t mg_tcpip_driver_pico_w_tx(const void *buf, size_t len,
              : len;
 }
 
-static bool mg_tcpip_driver_pico_w_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_pico_w_poll(struct mg_tcpip_if *ifp, bool s1) {
   (void) ifp;
-  return (cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA) ==
-          CYW43_LINK_JOIN);
+  cyw43_arch_poll(); // not necessary, except when IRQs are disabled (OTA)
+  return s1 ? (cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA) ==
+               CYW43_LINK_JOIN)
+            : false;
 }
 
 struct mg_tcpip_driver mg_tcpip_driver_pico_w = {
     mg_tcpip_driver_pico_w_init,
     mg_tcpip_driver_pico_w_tx,
     NULL,
-    mg_tcpip_driver_pico_w_up,
+    mg_tcpip_driver_pico_w_poll,
 };
 
 // Called once per outstanding frame by async_context
@@ -52,10 +61,14 @@ void cyw43_cb_process_ethernet(void *cb_data, int itf, size_t len,
 }
 
 // Called by async_context
-void cyw43_cb_tcpip_set_link_up(cyw43_t *self, int itf) {}
-void cyw43_cb_tcpip_set_link_down(cyw43_t *self, int itf) {}
+void cyw43_cb_tcpip_set_link_up(cyw43_t *self, int itf) {
+}
+void cyw43_cb_tcpip_set_link_down(cyw43_t *self, int itf) {
+}
 
 // there's life beyond lwIP
-void pbuf_copy_partial(void) {(void) 0;}
+void pbuf_copy_partial(void) {
+  (void) 0;
+}
 
 #endif
diff --git a/src/drivers/pico-w.h b/src/drivers/pico-w.h
index a71b947123..fd0b504612 100644
--- a/src/drivers/pico-w.h
+++ b/src/drivers/pico-w.h
@@ -10,13 +10,19 @@
 struct mg_tcpip_driver_pico_w_data {
   char *ssid;
   char *pass;
+  char *apssid;
+  char *appass;
+  uint8_t security; // TBD
+  uint8_t apsecurity; // TBD
+  uint8_t apchannel;
+  bool apmode;      // start in AP mode; 'false' starts connection to 'ssid' if not NULL
 };
 
 #define MG_TCPIP_DRIVER_INIT(mgr)                                 \
   do {                                                            \
     static struct mg_tcpip_driver_pico_w_data driver_data_;       \
     static struct mg_tcpip_if mif_;                               \
-    MG_SET_WIFI_CREDS(&driver_data_.ssid, &driver_data_.pass);    \
+    MG_SET_WIFI_CONFIG(&driver_data_);                            \
     mif_.ip = MG_TCPIP_IP;                                        \
     mif_.mask = MG_TCPIP_MASK;                                    \
     mif_.gw = MG_TCPIP_GW;                                        \
diff --git a/src/drivers/ppp.c b/src/drivers/ppp.c
index dc07220201..399f64fcd6 100644
--- a/src/drivers/ppp.c
+++ b/src/drivers/ppp.c
@@ -96,7 +96,8 @@ static uint32_t fcs_do(uint32_t fcs, uint8_t x) {
   return fcs;
 }
 
-static bool mg_ppp_up(struct mg_tcpip_if *ifp) {
+static bool mg_ppp_poll(struct mg_tcpip_if *ifp, bool s1) {
+  (void) s1;
   return ifp->driver_data != NULL;
 }
 
diff --git a/src/drivers/ra.c b/src/drivers/ra.c
index 1debe5d867..c6a4605e86 100644
--- a/src/drivers/ra.c
+++ b/src/drivers/ra.c
@@ -198,7 +198,8 @@ static size_t mg_tcpip_driver_ra_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_ra_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_ra_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_ra_data *d =
       (struct mg_tcpip_driver_ra_data *) ifp->driver_data;
   uint8_t speed = MG_PHY_SPEED_10M;
@@ -245,6 +246,6 @@ void EDMAC_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_ra = {mg_tcpip_driver_ra_init,
                                              mg_tcpip_driver_ra_tx, NULL,
-                                             mg_tcpip_driver_ra_up};
+                                             mg_tcpip_driver_ra_poll};
 
 #endif
diff --git a/src/drivers/same54.c b/src/drivers/same54.c
index 22b8ae13dd..2f41190934 100644
--- a/src/drivers/same54.c
+++ b/src/drivers/same54.c
@@ -1,6 +1,7 @@
 #include "net_builtin.h"
 
-#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_SAME54) && MG_ENABLE_DRIVER_SAME54
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_SAME54) && \
+    MG_ENABLE_DRIVER_SAME54
 
 #include <sam.h>
 
@@ -164,21 +165,22 @@ static size_t mg_tcpip_driver_same54_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_same54_up(struct mg_tcpip_if *ifp) {
-  uint16_t bsr = eth_read_phy(MG_PHY_ADDR, MG_PHYREG_BSR);
-  bool up = bsr & MG_PHYREGBIT_BSR_LINK_STATUS ? 1 : 0;
-
-  // If PHY is ready, update NCFGR accordingly
-  if (ifp->state == MG_TCPIP_STATE_DOWN && up) {
-    uint16_t bcr = eth_read_phy(MG_PHY_ADDR, MG_PHYREG_BCR);
-    bool fd = bcr & MG_PHYREGBIT_BCR_DUPLEX_MODE ? 1 : 0;
-    bool spd = bcr & MG_PHYREGBIT_BCR_SPEED ? 1 : 0;
-    GMAC_REGS->GMAC_NCFGR = (GMAC_REGS->GMAC_NCFGR &
-                             ~(GMAC_NCFGR_SPD_Msk | MG_PHYREGBIT_BCR_SPEED)) |
-                            GMAC_NCFGR_SPD(spd) | GMAC_NCFGR_FD(fd);
+static bool mg_tcpip_driver_same54_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (s1) {
+    uint16_t bsr = eth_read_phy(MG_PHY_ADDR, MG_PHYREG_BSR);
+    bool up = bsr & MG_PHYREGBIT_BSR_LINK_STATUS ? 1 : 0;
+
+    // If PHY is ready, update NCFGR accordingly
+    if (ifp->state == MG_TCPIP_STATE_DOWN && up) {
+      uint16_t bcr = eth_read_phy(MG_PHY_ADDR, MG_PHYREG_BCR);
+      bool fd = bcr & MG_PHYREGBIT_BCR_DUPLEX_MODE ? 1 : 0;
+      bool spd = bcr & MG_PHYREGBIT_BCR_SPEED ? 1 : 0;
+      GMAC_REGS->GMAC_NCFGR = (GMAC_REGS->GMAC_NCFGR &
+                               ~(GMAC_NCFGR_SPD_Msk | MG_PHYREGBIT_BCR_SPEED)) |
+                              GMAC_NCFGR_SPD(spd) | GMAC_NCFGR_FD(fd);
+    }
   }
-
-  return up;
+  return false;
 }
 
 void GMAC_Handler(void);
@@ -211,5 +213,5 @@ void GMAC_Handler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_same54 = {
     mg_tcpip_driver_same54_init, mg_tcpip_driver_same54_tx, NULL,
-    mg_tcpip_driver_same54_up};
+    mg_tcpip_driver_same54_poll};
 #endif
diff --git a/src/drivers/stm32f.c b/src/drivers/stm32f.c
index 0071d6107e..8fe46ed248 100644
--- a/src/drivers/stm32f.c
+++ b/src/drivers/stm32f.c
@@ -178,7 +178,8 @@ static size_t mg_tcpip_driver_stm32f_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_stm32f_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_stm32f_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_stm32f_data *d =
       (struct mg_tcpip_driver_stm32f_data *) ifp->driver_data;
   uint8_t phy_addr = d == NULL ? 0 : d->phy_addr;
@@ -229,5 +230,5 @@ void ETH_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_stm32f = {
     mg_tcpip_driver_stm32f_init, mg_tcpip_driver_stm32f_tx, NULL,
-    mg_tcpip_driver_stm32f_up};
+    mg_tcpip_driver_stm32f_poll};
 #endif
diff --git a/src/drivers/stm32h.c b/src/drivers/stm32h.c
index 0840bf7cf1..137d4b2d10 100644
--- a/src/drivers/stm32h.c
+++ b/src/drivers/stm32h.c
@@ -168,7 +168,8 @@ static size_t mg_tcpip_driver_stm32h_tx(const void *buf, size_t len,
   (void) ifp;
 }
 
-static bool mg_tcpip_driver_stm32h_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_stm32h_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_stm32h_data *d =
       (struct mg_tcpip_driver_stm32h_data *) ifp->driver_data;
   uint8_t phy_addr = d == NULL ? 0 : d->phy_addr;
@@ -223,5 +224,5 @@ void ETH_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_stm32h = {
     mg_tcpip_driver_stm32h_init, mg_tcpip_driver_stm32h_tx, NULL,
-    mg_tcpip_driver_stm32h_up};
+    mg_tcpip_driver_stm32h_poll};
 #endif
diff --git a/src/drivers/tm4c.c b/src/drivers/tm4c.c
index 55bd7c660a..7dde103ad7 100644
--- a/src/drivers/tm4c.c
+++ b/src/drivers/tm4c.c
@@ -205,7 +205,8 @@ static size_t mg_tcpip_driver_tm4c_tx(const void *buf, size_t len,
   (void) ifp;
 }
 
-static bool mg_tcpip_driver_tm4c_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_tm4c_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   uint32_t bmsr = emac_read_phy(EPHY_ADDR, EPHYBMSR);
   bool up = (bmsr & MG_BIT(2)) ? 1 : 0;
   if ((ifp->state == MG_TCPIP_STATE_DOWN) && up) {  // link state just went up
@@ -247,5 +248,5 @@ void EMAC0_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_tm4c = {mg_tcpip_driver_tm4c_init,
                                                mg_tcpip_driver_tm4c_tx, NULL,
-                                               mg_tcpip_driver_tm4c_up};
+                                               mg_tcpip_driver_tm4c_poll};
 #endif
diff --git a/src/drivers/tms570.c b/src/drivers/tms570.c
index f5776349ba..fd91091d13 100644
--- a/src/drivers/tms570.c
+++ b/src/drivers/tms570.c
@@ -172,12 +172,13 @@ static size_t mg_tcpip_driver_tms570_tx(const void *buf, size_t len,
   return len;
   (void) ifp;
 }
-static bool mg_tcpip_driver_tms570_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_tms570_poll(struct mg_tcpip_if *ifp, bool s1) {
   struct mg_tcpip_driver_tms570_data *d =
       (struct mg_tcpip_driver_tms570_data *) ifp->driver_data;
   uint8_t speed = MG_PHY_SPEED_10M;
   bool up = false, full_duplex = false;
   struct mg_phy phy = {emac_read_phy, emac_write_phy};
+  if (!s1) return false;
   up = mg_phy_up(&phy, d->phy_addr, &full_duplex, &speed);
   if ((ifp->state == MG_TCPIP_STATE_DOWN) && up) {
     // link state just went up
@@ -228,6 +229,6 @@ void EMAC_RX_IRQHandler(void) {
 }
 struct mg_tcpip_driver mg_tcpip_driver_tms570 = {mg_tcpip_driver_tms570_init,
                                                mg_tcpip_driver_tms570_tx, NULL,
-                                               mg_tcpip_driver_tms570_up};
+                                               mg_tcpip_driver_tms570_poll};
 #endif
 
diff --git a/src/drivers/w5100.c b/src/drivers/w5100.c
index a2d302788f..c7b619b688 100644
--- a/src/drivers/w5100.c
+++ b/src/drivers/w5100.c
@@ -2,8 +2,8 @@
 
 #if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_W5100) && MG_ENABLE_DRIVER_W5100
 
-static void w5100_txn(struct mg_tcpip_spi *s, uint16_t addr,
-                      bool wr, void *buf, size_t len) {
+static void w5100_txn(struct mg_tcpip_spi *s, uint16_t addr, bool wr, void *buf,
+                      size_t len) {
   size_t i;
   uint8_t *p = (uint8_t *) buf;
   uint8_t control = wr ? 0xF0 : 0x0F;
@@ -28,8 +28,8 @@ static  uint16_t w5100_r2(struct mg_tcpip_spi *s, uint16_t addr) { uint8_t buf[2
 
 static size_t w5100_rx(void *buf, size_t buflen, struct mg_tcpip_if *ifp) {
   struct mg_tcpip_spi *s = (struct mg_tcpip_spi *) ifp->driver_data;
-  uint16_t r = 0, n = 0, len = (uint16_t) buflen, n2;     // Read recv len
-  while ((n2 = w5100_r2(s, 0x426)) > n) n = n2;  // Until it is stable
+  uint16_t r = 0, n = 0, len = (uint16_t) buflen, n2;  // Read recv len
+  while ((n2 = w5100_r2(s, 0x426)) > n) n = n2;        // Until it is stable
   if (n > 0) {
     uint16_t ptr = w5100_r2(s, 0x428);  // Get read pointer
     if (n <= len + 2 && n > 1) {
@@ -46,7 +46,7 @@ static size_t w5100_rx(void *buf, size_t buflen, struct mg_tcpip_if *ifp) {
       w5100_rn(s, rxbuf_addr, buf + remaining_len, n - remaining_len);
     }
     w5100_w2(s, 0x428, (uint16_t) (ptr + n));
-    w5100_w1(s, 0x401, 0x40);                     // Sock0 CR -> RECV
+    w5100_w1(s, 0x401, 0x40);  // Sock0 CR -> RECV
   }
   return r;
 }
@@ -55,27 +55,27 @@ static size_t w5100_tx(const void *buf, size_t buflen,
                        struct mg_tcpip_if *ifp) {
   struct mg_tcpip_spi *s = (struct mg_tcpip_spi *) ifp->driver_data;
   uint16_t i, n = 0, ptr = 0, len = (uint16_t) buflen;
-  while (n < len) n = w5100_r2(s, 0x420);      // Wait for space
-  ptr = w5100_r2(s, 0x424);                    // Get write pointer
+  while (n < len) n = w5100_r2(s, 0x420);  // Wait for space
+  ptr = w5100_r2(s, 0x424);                // Get write pointer
   uint16_t txbuf_size = (1 << (w5100_r1(s, 0x1b) & 3)) * 1024;
   uint16_t ptr_ofs = ptr & (txbuf_size - 1);
   uint16_t txbuf_addr = 0x4000;
   if (ptr_ofs + len > txbuf_size) {
     uint16_t size = txbuf_size - ptr_ofs;
-    w5100_wn(s, txbuf_addr + ptr_ofs, (char*) buf, size);
-    w5100_wn(s, txbuf_addr, (char*) buf + size, len - size);
+    w5100_wn(s, txbuf_addr + ptr_ofs, (char *) buf, size);
+    w5100_wn(s, txbuf_addr, (char *) buf + size, len - size);
   } else {
-    w5100_wn(s, txbuf_addr + ptr_ofs, (char*) buf, len);
+    w5100_wn(s, txbuf_addr + ptr_ofs, (char *) buf, len);
   }
   w5100_w2(s, 0x424, (uint16_t) (ptr + len));  // Advance write pointer
-  w5100_w1(s, 0x401, 0x20);                       // Sock0 CR -> SEND
+  w5100_w1(s, 0x401, 0x20);                    // Sock0 CR -> SEND
   for (i = 0; i < 40; i++) {
     uint8_t ir = w5100_r1(s, 0x402);  // Read S0 IR
     if (ir == 0) continue;
     // printf("IR %d, len=%d, free=%d, ptr %d\n", ir, (int) len, (int) n, ptr);
-    w5100_w1(s, 0x402, ir);  // Write S0 IR: clear it!
-    if (ir & 8) len = 0;           // Timeout. Report error
-    if (ir & (16 | 8)) break;      // Stop on SEND_OK or timeout
+    w5100_w1(s, 0x402, ir);    // Write S0 IR: clear it!
+    if (ir & 8) len = 0;       // Timeout. Report error
+    if (ir & (16 | 8)) break;  // Stop on SEND_OK or timeout
   }
   return len;
 }
@@ -83,24 +83,24 @@ static size_t w5100_tx(const void *buf, size_t buflen,
 static bool w5100_init(struct mg_tcpip_if *ifp) {
   struct mg_tcpip_spi *s = (struct mg_tcpip_spi *) ifp->driver_data;
   s->end(s->spi);
-  w5100_w1(s, 0, 0x80);     // Reset chip: CR -> 0x80
-  w5100_w1(s, 0x72, 0x53);  // CR PHYLCKR -> unlock PHY
-  w5100_w1(s, 0x46, 0);     // CR PHYCR0 -> autonegotiation
-  w5100_w1(s, 0x47, 0);     // CR PHYCR1 -> reset
-  w5100_w1(s, 0x72, 0x00);  // CR PHYLCKR -> lock PHY
-  w5100_w1(s, 0x1a, 6);          // Sock0 RX buf size - 4KB
-  w5100_w1(s, 0x1b, 6);          // Sock0 TX buf size - 4KB
+  w5100_w1(s, 0, 0x80);               // Reset chip: CR -> 0x80
+  w5100_w1(s, 0x72, 0x53);            // CR PHYLCKR -> unlock PHY
+  w5100_w1(s, 0x46, 0);               // CR PHYCR0 -> autonegotiation
+  w5100_w1(s, 0x47, 0);               // CR PHYCR1 -> reset
+  w5100_w1(s, 0x72, 0x00);            // CR PHYLCKR -> lock PHY
+  w5100_w1(s, 0x1a, 6);               // Sock0 RX buf size - 4KB
+  w5100_w1(s, 0x1b, 6);               // Sock0 TX buf size - 4KB
   w5100_w1(s, 0x400, 4);              // Sock0 MR -> MACRAW
   w5100_w1(s, 0x401, 1);              // Sock0 CR -> OPEN
   return w5100_r1(s, 0x403) == 0x42;  // Sock0 SR == MACRAW
 }
 
-static bool w5100_up(struct mg_tcpip_if *ifp) {
+static bool w5100_poll(struct mg_tcpip_if *ifp, bool s1) {
   struct mg_tcpip_spi *spi = (struct mg_tcpip_spi *) ifp->driver_data;
-  uint8_t physr0 = w5100_r1(spi, 0x3c);
-  return physr0 & 1;  // Bit 0 of PHYSR is LNK (0 - down, 1 - up)
+  return s1 ? w5100_r1(spi, 0x3c /* PHYSR */) & 1
+            : false;  // Bit 0 of PHYSR is LNK (0 - down, 1 - up)
 }
 
 struct mg_tcpip_driver mg_tcpip_driver_w5100 = {w5100_init, w5100_tx, w5100_rx,
-                                                w5100_up};
+                                                w5100_poll};
 #endif
diff --git a/src/drivers/w5500.c b/src/drivers/w5500.c
index b7cb544abe..b76289d6ad 100644
--- a/src/drivers/w5500.c
+++ b/src/drivers/w5500.c
@@ -81,12 +81,12 @@ static bool w5500_init(struct mg_tcpip_if *ifp) {
   return w5500_r1(s, W5500_S0, 3) == 0x42;  // Sock0 SR == MACRAW
 }
 
-static bool w5500_up(struct mg_tcpip_if *ifp) {
+static bool w5500_poll(struct mg_tcpip_if *ifp, bool s1) {
   struct mg_tcpip_spi *spi = (struct mg_tcpip_spi *) ifp->driver_data;
-  uint8_t phycfgr = w5500_r1(spi, W5500_CR, 0x2e);
-  return phycfgr & 1;  // Bit 0 of PHYCFGR is LNK (0 - down, 1 - up)
+  return s1 ? w5500_r1(spi, W5500_CR, 0x2e /* PHYCFGR */) & 1
+            : false;  // Bit 0 of PHYCFGR is LNK (0 - down, 1 - up)
 }
 
 struct mg_tcpip_driver mg_tcpip_driver_w5500 = {w5500_init, w5500_tx, w5500_rx,
-                                                w5500_up};
+                                                w5500_poll};
 #endif
diff --git a/src/drivers/xmc.c b/src/drivers/xmc.c
index ef621573c0..935b3df7a7 100644
--- a/src/drivers/xmc.c
+++ b/src/drivers/xmc.c
@@ -179,7 +179,8 @@ static size_t mg_tcpip_driver_xmc_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_xmc_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_xmc_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_xmc_data *d =
       (struct mg_tcpip_driver_xmc_data *) ifp->driver_data;
   uint8_t speed = MG_PHY_SPEED_10M;
@@ -226,5 +227,5 @@ void ETH0_0_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_xmc = {
     mg_tcpip_driver_xmc_init, mg_tcpip_driver_xmc_tx, NULL,
-    mg_tcpip_driver_xmc_up};
+    mg_tcpip_driver_xmc_poll};
 #endif
diff --git a/src/drivers/xmc7.c b/src/drivers/xmc7.c
index f35bb0326f..da696f017e 100644
--- a/src/drivers/xmc7.c
+++ b/src/drivers/xmc7.c
@@ -181,7 +181,8 @@ static size_t mg_tcpip_driver_xmc7_tx(const void *buf, size_t len,
   return len;
 }
 
-static bool mg_tcpip_driver_xmc7_up(struct mg_tcpip_if *ifp) {
+static bool mg_tcpip_driver_xmc7_poll(struct mg_tcpip_if *ifp, bool s1) {
+  if (!s1) return false;
   struct mg_tcpip_driver_xmc7_data *d =
       (struct mg_tcpip_driver_xmc7_data *) ifp->driver_data;
   uint8_t speed = MG_PHY_SPEED_10M;
@@ -234,5 +235,5 @@ void ETH_IRQHandler(void) {
 
 struct mg_tcpip_driver mg_tcpip_driver_xmc7 = {mg_tcpip_driver_xmc7_init,
                                                mg_tcpip_driver_xmc7_tx, NULL,
-                                               mg_tcpip_driver_xmc7_up};
+                                               mg_tcpip_driver_xmc7_poll};
 #endif
diff --git a/src/net_builtin.c b/src/net_builtin.c
index 964681f6be..3c38d81c04 100644
--- a/src/net_builtin.c
+++ b/src/net_builtin.c
@@ -914,24 +914,27 @@ static void mg_tcpip_poll(struct mg_tcpip_if *ifp, uint64_t now) {
     ifp->state = MG_TCPIP_STATE_READY;  // keep best-effort MAC
     onstatechange(ifp);
   }
-  // Handle physical interface up/down status
-  if (expired_1000ms && ifp->driver->up) {
-    bool up = ifp->driver->up(ifp);
-    bool current = ifp->state != MG_TCPIP_STATE_DOWN;
-    if (!up && ifp->enable_dhcp_client) ifp->ip = 0;
-    if (up != current) {  // link state has changed
-      ifp->state = up == false ? MG_TCPIP_STATE_DOWN
-                   : ifp->enable_dhcp_client || ifp->ip == 0
-                       ? MG_TCPIP_STATE_UP
-                       : MG_TCPIP_STATE_IP;
-      onstatechange(ifp);
-    } else if (!ifp->enable_dhcp_client && ifp->state == MG_TCPIP_STATE_UP &&
-               ifp->ip) {
-      ifp->state = MG_TCPIP_STATE_IP;  // ifp->fn has set an IP
-      onstatechange(ifp);
+  // poll driver
+  if (ifp->driver->poll) {
+    bool up = ifp->driver->poll(ifp, expired_1000ms);
+    // Handle physical interface up/down status
+    if (expired_1000ms) {
+      bool current = ifp->state != MG_TCPIP_STATE_DOWN;
+      if (!up && ifp->enable_dhcp_client) ifp->ip = 0;
+      if (up != current) {  // link state has changed
+        ifp->state = up == false ? MG_TCPIP_STATE_DOWN
+                     : ifp->enable_dhcp_client || ifp->ip == 0
+                         ? MG_TCPIP_STATE_UP
+                         : MG_TCPIP_STATE_IP;
+        onstatechange(ifp);
+      } else if (!ifp->enable_dhcp_client && ifp->state == MG_TCPIP_STATE_UP &&
+                 ifp->ip) {
+        ifp->state = MG_TCPIP_STATE_IP;  // ifp->fn has set an IP
+        onstatechange(ifp);
+      }
+      if (ifp->state == MG_TCPIP_STATE_DOWN) MG_ERROR(("Network is down"));
+      mg_tcpip_call(ifp, MG_TCPIP_EV_TIMER_1S, NULL);
     }
-    if (ifp->state == MG_TCPIP_STATE_DOWN) MG_ERROR(("Network is down"));
-    mg_tcpip_call(ifp, MG_TCPIP_EV_TIMER_1S, NULL);
   }
   if (ifp->state == MG_TCPIP_STATE_DOWN) return;
 
@@ -953,14 +956,14 @@ static void mg_tcpip_poll(struct mg_tcpip_if *ifp, uint64_t now) {
   }
 
   // Read data from the network
-  if (ifp->driver->rx != NULL) {  // Polling driver. We must call it
+  if (ifp->driver->rx != NULL) {  // Simple polling driver, returns one frame
     size_t len =
         ifp->driver->rx(ifp->recv_queue.buf, ifp->recv_queue.size, ifp);
     if (len > 0) {
       ifp->nrecv++;
       mg_tcpip_rx(ifp, ifp->recv_queue.buf, len);
     }
-  } else {  // Interrupt-based driver. Fills recv queue itself
+  } else {  // Complex poll / Interrupt-based driver. Queues recvd frames
     char *buf;
     size_t len = mg_queue_next(&ifp->recv_queue, &buf);
     if (len > 0) {
diff --git a/src/net_builtin.h b/src/net_builtin.h
index 31c21298b0..e9b7ad9362 100644
--- a/src/net_builtin.h
+++ b/src/net_builtin.h
@@ -11,21 +11,42 @@ struct mg_tcpip_driver {
   bool (*init)(struct mg_tcpip_if *);                         // Init driver
   size_t (*tx)(const void *, size_t, struct mg_tcpip_if *);   // Transmit frame
   size_t (*rx)(void *buf, size_t len, struct mg_tcpip_if *);  // Receive frame
-  bool (*up)(struct mg_tcpip_if *);                           // Up/down status
+  bool (*poll)(struct mg_tcpip_if *, bool);  // Poll, return Up/down status
 };
 
 typedef void (*mg_tcpip_event_handler_t)(struct mg_tcpip_if *ifp, int ev,
                                          void *ev_data);
 
 enum {
-  MG_TCPIP_EV_ST_CHG,     // state change             uint8_t * (&ifp->state)
-  MG_TCPIP_EV_DHCP_DNS,   // DHCP DNS assignment      uint32_t *ipaddr
-  MG_TCPIP_EV_DHCP_SNTP,  // DHCP SNTP assignment     uint32_t *ipaddr
-  MG_TCPIP_EV_ARP,        // Got ARP packet           struct mg_str *
-  MG_TCPIP_EV_TIMER_1S,   // 1 second timer           NULL
-  MG_TCPIP_EV_USER        // Starting ID for user events
+  MG_TCPIP_EV_ST_CHG,           // state change                   uint8_t * (&ifp->state)
+  MG_TCPIP_EV_DHCP_DNS,         // DHCP DNS assignment            uint32_t *ipaddr
+  MG_TCPIP_EV_DHCP_SNTP,        // DHCP SNTP assignment           uint32_t *ipaddr
+  MG_TCPIP_EV_ARP,              // Got ARP packet                 struct mg_str *
+  MG_TCPIP_EV_TIMER_1S,         // 1 second timer                 NULL
+  MG_TCPIP_EV_WIFI_SCAN_RESULT, // Wi-Fi scan results             struct mg_wifi_scan_bss_data *
+  MG_TCPIP_EV_WIFI_SCAN_END,    // Wi-Fi scan has finished        NULL
+  MG_TCPIP_EV_WIFI_CONNECT_ERR, // Wi-Fi connect has failed       chip specific
+  MG_TCPIP_EV_USER              // Starting ID for user events
 };
 
+struct mg_wifi_scan_bss_data {
+    struct mg_str SSID;
+    char *BSSID;
+    int16_t RSSI;
+    uint8_t security;
+#define MG_WIFI_SECURITY_OPEN 0
+#define MG_WIFI_SECURITY_WEP  MG_BIT(0)
+#define MG_WIFI_SECURITY_WPA  MG_BIT(1)
+#define MG_WIFI_SECURITY_WPA2 MG_BIT(2)
+#define MG_WIFI_SECURITY_WPA3 MG_BIT(3)
+    uint8_t channel;
+    unsigned band :2;
+#define MG_WIFI_BAND_2G 0
+#define MG_WIFI_BAND_5G 1
+    unsigned has_n :1;
+};
+
+
 // Network interface
 struct mg_tcpip_if {
   uint8_t mac[6];                  // MAC address. Must be set to a valid MAC
diff --git a/test/driver_mock.c b/test/driver_mock.c
index 5801b15ff2..ff9f25dc2e 100644
--- a/test/driver_mock.c
+++ b/test/driver_mock.c
@@ -13,9 +13,9 @@ static size_t mock_rx(void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return 0;
 }
 
-static bool mock_up(struct mg_tcpip_if *ifp) {
+static bool mock_poll(struct mg_tcpip_if *ifp, bool s1) {
   (void) ifp;
-  return true;
+  return s1;
 }
 
-struct mg_tcpip_driver mg_tcpip_driver_mock = {mock_init, mock_tx, mock_rx, mock_up};
+struct mg_tcpip_driver mg_tcpip_driver_mock = {mock_init, mock_tx, mock_rx, mock_poll};
diff --git a/test/mip_tap_test.c b/test/mip_tap_test.c
index 75f24e8166..75cffd488a 100644
--- a/test/mip_tap_test.c
+++ b/test/mip_tap_test.c
@@ -110,8 +110,8 @@ static size_t tap_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return (size_t) res;
 }
 
-static bool tap_up(struct mg_tcpip_if *ifp) {
-  return ifp->driver_data ? true : false;
+static bool tap_poll(struct mg_tcpip_if *ifp, bool s1) {
+  return s1 && ifp->driver_data ? true : false;
 }
 
 static void eh1(struct mg_connection *c, int ev, void *ev_data) {
@@ -412,7 +412,7 @@ int main(void) {
   memset(&driver, 0, sizeof(driver));
 
   driver.tx = tap_tx;
-  driver.up = tap_up;
+  driver.poll = tap_poll;
   driver.rx = tap_rx;
 
   struct mg_tcpip_if mif;
diff --git a/test/mip_test.c b/test/mip_test.c
index 30d0ccb96f..8934345cdf 100644
--- a/test/mip_test.c
+++ b/test/mip_test.c
@@ -103,8 +103,8 @@ static size_t if_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return len;
 }
 
-static bool if_up(struct mg_tcpip_if *ifp) {
-  return ifp->driver_data ? true : false;
+static bool if_poll(struct mg_tcpip_if *ifp, bool s1) {
+  return s1 && ifp->driver_data ? true : false;
 }
 
 static size_t if_rx(void *buf, size_t len, struct mg_tcpip_if *ifp) {
@@ -168,7 +168,7 @@ static void test_retransmit(void) {
   mg_mgr_init(&mgr);
   memset(&mif, 0, sizeof(mif));
   memset(&s_driver_data, 0, sizeof(struct driver_data));
-  driver.init = NULL, driver.tx = if_tx, driver.up = if_up, driver.rx = if_rx;
+  driver.init = NULL, driver.tx = if_tx, driver.poll = if_poll, driver.rx = if_rx;
   mif.driver = &driver;
   mif.driver_data = &s_driver_data;
   mg_tcpip_init(&mgr, &mif);
@@ -254,7 +254,7 @@ static void test_frag_recv_path(void) {
   mg_mgr_init(&mgr);
   memset(&mif, 0, sizeof(mif));
   memset(&s_driver_data, 0, sizeof(struct driver_data));
-  driver.init = NULL, driver.tx = if_tx, driver.up = if_up, driver.rx = if_rx;
+  driver.init = NULL, driver.tx = if_tx, driver.poll = if_poll, driver.rx = if_rx;
   mif.driver = &driver;
   mif.driver_data = &s_driver_data;
   mg_tcpip_init(&mgr, &mif);
@@ -295,7 +295,7 @@ static void test_frag_send_path(void) {
   mg_mgr_init(&mgr);
   memset(&mif, 0, sizeof(mif));
   memset(&s_driver_data, 0, sizeof(struct driver_data));
-  driver.init = NULL, driver.tx = if_tx, driver.up = if_up, driver.rx = if_rx;
+  driver.init = NULL, driver.tx = if_tx, driver.poll = if_poll, driver.rx = if_rx;
   mif.driver = &driver;
   mif.driver_data = &s_driver_data;
   mg_tcpip_init(&mgr, &mif);
diff --git a/tutorials/tcpip/pcap-driver/main.c b/tutorials/tcpip/pcap-driver/main.c
index b8646c9d72..fefb67dd7f 100644
--- a/tutorials/tcpip/pcap-driver/main.c
+++ b/tutorials/tcpip/pcap-driver/main.c
@@ -79,8 +79,8 @@ static size_t pcap_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return res == PCAP_ERROR ? 0 : len;
 }
 
-static bool pcap_up(struct mg_tcpip_if *ifp) {
-  return ifp->driver_data ? true : false;
+static bool pcap_poll(struct mg_tcpip_if *ifp, bool s1) {
+  return s1 && ifp->driver_data ? true : false;
 }
 
 static size_t pcap_rx(void *buf, size_t len, struct mg_tcpip_if *ifp) {
@@ -272,7 +272,7 @@ int main(int argc, char *argv[]) {
   mg_mgr_init(&mgr);        // Initialise event manager
   mg_log_set(MG_LL_DEBUG);  // Set log level
 
-  struct mg_tcpip_driver driver = {.tx = pcap_tx, .up = pcap_up, .rx = pcap_rx};
+  struct mg_tcpip_driver driver = {.tx = pcap_tx, .poll = pcap_poll, .rx = pcap_rx};
   struct mg_tcpip_if mif = {.driver = &driver,
                             .driver_data = ph,
                             .enable_mac_check = true,
diff --git a/tutorials/tcpip/tap-driver/main.c b/tutorials/tcpip/tap-driver/main.c
index 17fc0d0705..008ae9a351 100644
--- a/tutorials/tcpip/tap-driver/main.c
+++ b/tutorials/tcpip/tap-driver/main.c
@@ -31,8 +31,8 @@ static size_t tap_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
   return (size_t) res;
 }
 
-static bool tap_up(struct mg_tcpip_if *ifp) {
-  return ifp->driver_data ? true : false;
+static bool tap_poll(struct mg_tcpip_if *ifp, bool s1) {
+  return s1 && ifp->driver_data ? true : false;
 }
 
 static size_t tap_rx(void *buf, size_t len, struct mg_tcpip_if *ifp) {
@@ -109,7 +109,7 @@ int main(int argc, char *argv[]) {
   struct mg_mgr mgr;  // Event manager
   mg_mgr_init(&mgr);  // Initialise event manager
 
-  struct mg_tcpip_driver driver = {.tx = tap_tx, .up = tap_up, .rx = tap_rx};
+  struct mg_tcpip_driver driver = {.tx = tap_tx, .poll = tap_poll, .rx = tap_rx};
   struct mg_tcpip_if mif = {.driver = &driver,
                             .driver_data = &fd,
                             .enable_req_dns = true,