extmod/zephyr_ble: Remove last two Zephyr submodule patches.

Move the remaining two Zephyr submodule patches (HCI driver, quirk
reset) into wrapper files, eliminating all custom patches from the
lib/zephyr submodule.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>

Author: pi-anl

extmod/zephyr_ble/hci_driver_wrapper.c

@@ -0,0 +1,58 @@
+/*
+ * Wrapper for Zephyr hci_driver.c that adds cooperative poll_rx function.
+ *
+ * hci_driver.c's static sem_recv, recv_fifo, node_rx_recv(), and
+ * process_node() are inaccessible from outside the translation unit.
+ * We compile hci_driver.c as part of this TU so we can provide
+ * hci_driver_poll_rx() without patching the Zephyr submodule.
+ *
+ * This file REPLACES hci_driver.c in the build — do not compile both.
+ */
+
+#include "lib/zephyr/subsys/bluetooth/controller/hci/hci_driver.c"
+
+/* Cooperative polling: process one recv_fifo node per call.
+ * Called from the main loop when running without real Zephyr threads
+ * (e.g. MicroPython's cooperative BLE integration).
+ * Returns true if more nodes are pending, false if recv_fifo is empty.
+ * Caller should interleave work processing between calls to match
+ * full Zephyr's threading model.
+ */
+bool hci_driver_poll_rx(const struct device *dev)
+{
+	const struct hci_driver_data *data = dev->data;
+
+	/* Process controller RX — moves PDUs from LL into recv_fifo
+	 * and sends completed-event notifications directly via bt_recv.
+	 */
+#if !defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
+	if (k_sem_count_get(&sem_recv) > 0) {
+		k_sem_take(&sem_recv, K_NO_WAIT);
+		node_rx_recv(dev);
+	}
+#endif /* !CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+
+	/* Process ONE recv_fifo node */
+	struct node_rx_pdu *node_rx = k_fifo_get(&recv_fifo, K_NO_WAIT);
+
+	if (node_rx == NULL) {
+		return false;
+	}
+
+	struct net_buf *buf = process_node(node_rx);
+
+	while (buf) {
+		struct net_buf *frag = net_buf_ref(buf);
+
+		buf = net_buf_frag_del(NULL, buf);
+
+		if (frag->len > 1) {
+			data->recv(dev, frag);
+		} else {
+			net_buf_unref(frag);
+		}
+	}
+
+	/* Return true if more nodes pending */
+	return !k_fifo_is_empty(&recv_fifo);
+}

extmod/zephyr_ble/zephyr_ble.mk

@@ -194,10 +194,9 @@ ifeq ($(MICROPY_BLUETOOTH_ZEPHYR_CONTROLLER),1)
 CFLAGS_EXTMOD += -DMICROPY_BLUETOOTH_ZEPHYR_CONTROLLER=1
 
 # Controller HCI interface
-SRC_THIRDPARTY_C += $(addprefix $(ZEPHYR_LIB_DIR)/subsys/bluetooth/controller/hci/, \
-	hci_driver.c \
-	hci.c \
-	)
+# hci_driver.c compiled via wrapper (adds poll_rx accessing file-scope variables)
+SRC_THIRDPARTY_C += $(ZEPHYR_LIB_DIR)/subsys/bluetooth/controller/hci/hci.c
+SRC_THIRDPARTY_C += $(ZEPHYR_BLE_EXTMOD_DIR)/hci_driver_wrapper.c
 
 # Nordic vendor HCI (reads FICR device address for stable BLE identity)
 SRC_THIRDPARTY_C += $(ZEPHYR_LIB_DIR)/subsys/bluetooth/controller/ll_sw/nordic/hci/hci_vendor.c
@@ -299,6 +298,12 @@ $(BUILD)/$(ZEPHYR_LIB_DIR)/subsys/bluetooth/controller/%.o: CFLAGS += -Wno-error
 	-include zephyr/bluetooth/hci_vs.h -include zephyr/bluetooth/buf.h \
 	-include zephyr_ble_irq.h $(CFLAGS_CONTROLLER_COMPAT)
 
+# hci_driver_wrapper.c includes hci_driver.c — needs full controller CFLAGS
+$(BUILD)/$(ZEPHYR_BLE_EXTMOD_DIR)/hci_driver_wrapper.o: CFLAGS += -Wno-error -Wno-format \
+	-Wno-unused-variable -Wno-lto-type-mismatch \
+	-include zephyr/bluetooth/hci_vs.h -include zephyr/bluetooth/buf.h \
+	-include zephyr_ble_irq.h $(CFLAGS_CONTROLLER_COMPAT)
+
 endif # MICROPY_BLUETOOTH_ZEPHYR_CONTROLLER
 
 endif