From ed79fe86aa98814a0fccf3ae895df54b2b60e5ae Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Mon, 27 Jan 2025 14:16:13 -0300 Subject: [PATCH] fix SDK 1.5 not building in recent gcc (update to SDK 2.1) --- examples/pico-sdk/pico-rndis-dashboard/Makefile | 2 +- examples/pico-sdk/pico-rndis-dashboard/main.c | 2 +- examples/pico-sdk/pico-rndis-device/Makefile | 2 +- examples/pico-sdk/pico-rndis-device/main.c | 2 +- examples/pico-sdk/pico-rndis-device/mongoose_config.h | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/pico-sdk/pico-rndis-dashboard/Makefile b/examples/pico-sdk/pico-rndis-dashboard/Makefile index 5af7835e..7f7334e2 100644 --- a/examples/pico-sdk/pico-rndis-dashboard/Makefile +++ b/examples/pico-sdk/pico-rndis-dashboard/Makefile @@ -13,7 +13,7 @@ build build/firmware.uf2: pico-sdk main.c net.c cd build && cmake -G "Unix Makefiles" .. && make pico-sdk: - git clone --depth 1 -b 1.5.0 https://github.com/raspberrypi/pico-sdk $@ + git clone --depth 1 -b 2.1.0 https://github.com/raspberrypi/pico-sdk $@ cd $@ && git submodule update --init clean: diff --git a/examples/pico-sdk/pico-rndis-dashboard/main.c b/examples/pico-sdk/pico-rndis-dashboard/main.c index e31e0787..ab5fc83d 100644 --- a/examples/pico-sdk/pico-rndis-dashboard/main.c +++ b/examples/pico-sdk/pico-rndis-dashboard/main.c @@ -8,7 +8,7 @@ static struct mg_tcpip_if *s_ifp; -const uint8_t tud_network_mac_address[6] = {2, 2, 0x84, 0x6A, 0x96, 0}; +uint8_t tud_network_mac_address[6] = {2, 2, 0x84, 0x6A, 0x96, 0}; static void blink_cb(void *arg) { // Blink periodically gpio_put(PICO_DEFAULT_LED_PIN, !gpio_get_out_level(PICO_DEFAULT_LED_PIN)); diff --git a/examples/pico-sdk/pico-rndis-device/Makefile b/examples/pico-sdk/pico-rndis-device/Makefile index 5af7835e..7f7334e2 100644 --- a/examples/pico-sdk/pico-rndis-device/Makefile +++ b/examples/pico-sdk/pico-rndis-device/Makefile @@ -13,7 +13,7 @@ build build/firmware.uf2: pico-sdk main.c net.c cd build && cmake -G "Unix Makefiles" .. && make pico-sdk: - git clone --depth 1 -b 1.5.0 https://github.com/raspberrypi/pico-sdk $@ + git clone --depth 1 -b 2.1.0 https://github.com/raspberrypi/pico-sdk $@ cd $@ && git submodule update --init clean: diff --git a/examples/pico-sdk/pico-rndis-device/main.c b/examples/pico-sdk/pico-rndis-device/main.c index af168620..2d72cfd1 100644 --- a/examples/pico-sdk/pico-rndis-device/main.c +++ b/examples/pico-sdk/pico-rndis-device/main.c @@ -25,7 +25,7 @@ int hal_led_pin(void) { static struct mg_tcpip_if *s_ifp; -const uint8_t tud_network_mac_address[6] = {2, 2, 0x84, 0x6A, 0x96, 0}; +uint8_t tud_network_mac_address[6] = {2, 2, 0x84, 0x6A, 0x96, 0}; bool tud_network_recv_cb(const uint8_t *buf, uint16_t len) { mg_tcpip_qwrite((void *) buf, len, s_ifp); diff --git a/examples/pico-sdk/pico-rndis-device/mongoose_config.h b/examples/pico-sdk/pico-rndis-device/mongoose_config.h index c2729977..2c88e5c6 100644 --- a/examples/pico-sdk/pico-rndis-device/mongoose_config.h +++ b/examples/pico-sdk/pico-rndis-device/mongoose_config.h @@ -3,4 +3,3 @@ #define MG_ENABLE_TCPIP 1 #define MG_ENABLE_TCPIP_DRIVER_INIT 0 #define MG_ENABLE_PACKED_FS 1 -