From fef957140095101127286c567ef402641f826412 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 8 Mar 2023 22:43:12 -0500
Subject: [PATCH] pico-sdk to 1.5.0; cyw43-driver to 0.9.0

---
 .gitmodules                        |  3 +--
 ports/raspberrypi/Makefile         | 30 ++++++++++++------------------
 ports/raspberrypi/lib/cyw43-driver |  2 +-
 ports/raspberrypi/sdk              |  2 +-
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 3de3c6a51e..2ba84b4305 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -309,8 +309,7 @@
         branch = circuitpython
 [submodule "ports/raspberrypi/lib/cyw43-driver"]
 	path = ports/raspberrypi/lib/cyw43-driver
-	url = https://github.com/adafruit/cyw43-driver.git
-	branch = circuitpython8
+	url = https://github.com/georgerobotics/cyw43-driver.git
 [submodule "ports/raspberrypi/lib/lwip"]
 	path = ports/raspberrypi/lib/lwip
 	url = https://github.com/adafruit/lwip.git
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index ee0356b852..e36ed78eb1 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -33,17 +33,23 @@ INC_CYW43 := \
 	-isystem lib/cyw43-driver/firmware \
 	-isystem lib/cyw43-driver/src \
 	-isystem lib/lwip/src/include \
+        -isystem sdk/src/rp2_common/pico_async_context/include/ \
 	-isystem sdk/src/rp2_common/pico_cyw43_arch/include/ \
+	-isystem sdk/src/rp2_common/pico_cyw43_driver/include/ \
 	-isystem sdk/src/rp2_common/pico_lwip/include/ \
+        -isystem sdk/src/rp2_common/pico_rand/include/ \
 
 CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DIGNORE_GPIO23 -DIGNORE_GPIO24 -DCYW43_LOGIC_DEBUG=0 -DCYW43_NETUTILS=1
 SRC_SDK_CYW43 := \
 	src/common/pico_sync/sem.c \
-	src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c \
+	src/rp2_common/pico_async_context/async_context_base.c \
+	src/rp2_common/pico_async_context/async_context_threadsafe_background.c \
 	src/rp2_common/pico_cyw43_arch/cyw43_arch.c \
 	src/rp2_common/pico_cyw43_arch/cyw43_arch_threadsafe_background.c \
-	src/rp2_common/pico_lwip/nosys.c \
-	src/rp2_common/pico_lwip/random.c \
+	src/rp2_common/pico_cyw43_driver/cyw43_driver.c \
+	src/rp2_common/pico_cyw43_driver/cyw43_bus_pio_spi.c \
+	src/rp2_common/pico_lwip/lwip_nosys.c \
+	src/rp2_common/pico_rand/rand.c \
 
 SRC_LWIP := \
 	shared/netutils/netutils.c \
@@ -69,27 +75,15 @@ $(PIOASM):
 	$(Q)cmake -S pioasm -B $(BUILD)/pioasm
 	$(Q)$(MAKE) -C $(BUILD)/pioasm PioasmBuild
 
-$(BUILD)/cyw43_bus_pio_spi.pio.h: sdk/src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.pio $(PIOASM)
+$(BUILD)/cyw43_bus_pio_spi.pio.h: sdk/src/rp2_common/pico_cyw43_driver/cyw43_bus_pio_spi.pio $(PIOASM)
 	$(Q)$(PIOASM) -o c-sdk $< $@
-$(BUILD)/sdk/src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.o: $(BUILD)/cyw43_bus_pio_spi.pio.h
+$(BUILD)/sdk/src/rp2_common/pico_cyw43_driver/cyw43_bus_pio_spi.o: $(BUILD)/cyw43_bus_pio_spi.pio.h
 
-CYW43_FIRMWARE_BIN = 43439A0-7.95.49.00.combined
-
-$(BUILD)/cyw43_resource.o: lib/cyw43-driver/firmware/$(CYW43_FIRMWARE_BIN)
-	$(Q)$(OBJCOPY) -I binary -O elf32-littlearm -B arm \
-		--readonly-text \
-		--rename-section .data=.big_const,contents,alloc,load,readonly,data \
-		--redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_start=fw_43439A0_7_95_49_00_start \
-		--redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_size=fw_43439A0_7_95_49_00_size \
-		--redefine-sym _binary_lib_cyw43_driver_firmware_43439A0_7_95_49_00_combined_end=fw_43439A0_7_95_49_00_end \
-		$< $@
-OBJ_CYW43 := $(BUILD)/cyw43_resource.o
 else
 INC_CYW43 :=
 CFLAGS_CYW43 :=
 SRC_SDK_CYW43 :=
 SRC_CYW43 :=
-OBJ_CYW43 :=
 SRC_LWIP :=
 endif
 
@@ -377,7 +371,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S_UPPER:.S=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 OBJ += $(BUILD)/boot2_padded_checksummed.o
-OBJ += $(OBJ_CYW43) $(OBJ_MBEDTLS)
+OBJ += $(OBJ_MBEDTLS)
 
 $(BUILD)/%.o: $(BUILD)/%.S
 	$(STEPECHO) "CC $<"
diff --git a/ports/raspberrypi/lib/cyw43-driver b/ports/raspberrypi/lib/cyw43-driver
index 2cf328d9e4..e52dd14a15 160000
--- a/ports/raspberrypi/lib/cyw43-driver
+++ b/ports/raspberrypi/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 2cf328d9e41603405a037a29e081a7d30dd519e6
+Subproject commit e52dd14a15e6a53e6263840704470246aa77c5ce
diff --git a/ports/raspberrypi/sdk b/ports/raspberrypi/sdk
index 2e6142b15b..2ccab115de 160000
--- a/ports/raspberrypi/sdk
+++ b/ports/raspberrypi/sdk
@@ -1 +1 @@
-Subproject commit 2e6142b15b8a75c1227dd3edbe839193b2bf9041
+Subproject commit 2ccab115de0d42d31d6611cca19ef0cd0d2ccaa7