Add uzlib to build

Add build changes needed for firmware compression. Enhance
cyw43_write_bytes to allow us to use a src pointer part way through
spid_buf which is used as a temorary buffer for firmware decompression

Author: peterharperuk

src/rp2_common/CMakeLists.txt

@@ -67,6 +67,7 @@ if (NOT PICO_BARE_METAL)
     pico_add_subdirectory(pico_lwip)
     pico_add_subdirectory(pico_cyw43_arch)
     pico_add_subdirectory(pico_mbedtls)
+    pico_add_subdirectory(pico_uzlib)
 
     pico_add_subdirectory(pico_stdlib)
 
@@ -84,4 +85,4 @@ set(CMAKE_EXECUTABLE_SUFFIX "${CMAKE_EXECUTABLE_SUFFIX}" PARENT_SCOPE)
 pico_add_doxygen(${CMAKE_CURRENT_LIST_DIR})
 pico_add_doxygen_exclude(${CMAKE_CURRENT_LIST_DIR}/cmsis)
 
-pico_promote_common_scope_vars()
+pico_promote_common_scope_vars()

src/rp2_common/pico_cyw43_driver/cyw43_bus_pio_spi.c

@@ -534,9 +534,14 @@ int cyw43_write_bytes(cyw43_int_t *self, uint32_t fn, uint32_t addr, size_t len,
         int res = cyw43_spi_transfer(self, (uint8_t *)&self->spi_header[1], aligned_len + 4, NULL, 0);
         logic_debug_set(pin_WIFI_TX, 0);
         return res;
+    } else if (src > self->spid_buf + sizeof(uint32_t) && src < (self->spid_buf + sizeof(self->spid_buf))) {
+        assert(src + len <= (self->spid_buf + sizeof(self->spid_buf))); // don't go over the end of the buffer
+        uint32_t *spi_header = (void*)(self->spid_buf + (src - self->spid_buf) - sizeof(uint32_t));
+        *spi_header = make_cmd(true, true, fn, addr, len);
+        return cyw43_spi_transfer(self, (uint8_t *)spi_header, aligned_len + 4, NULL, 0);
     } else {
         // todo: would be nice to get rid of this. Only used for firmware download?
-        assert(src < self->spid_buf || src >= (self->spid_buf + sizeof(self->spid_buf)));
+        assert(src < self->spid_buf || src >= (self->spid_buf + sizeof(self->spid_buf))); // check we're not using self->spid_buf
         self->spi_header[1] = make_cmd(true, true, fn, addr, len);
         memcpy(self->spid_buf, src, len);
         return cyw43_spi_transfer(self, (uint8_t *)&self->spi_header[1], aligned_len + 4, NULL, 0);

test/kitchen_sink/CMakeLists.txt

@@ -42,6 +42,7 @@ target_link_libraries(kitchen_sink_libs INTERFACE
     pico_time
     pico_unique_id
     pico_util
+    pico_uzlib
 )
 
 add_library(kitchen_sink_options INTERFACE)
@@ -177,3 +178,7 @@ endif()
 if (TARGET pico_btstack_base AND COMMAND suppress_btstack_warnings)
     suppress_btstack_warnings()
 endif()
+
+if (TARGET pico_uzlib AND COMMAND suppress_uzlib_warnings)
+    suppress_uzlib_warnings()
+endif()