Enable PIO USB Host on RP2350

ports/raspberrypi/Makefile

@@ -124,6 +124,7 @@ INC += \
 	-isystem sdk/src/rp2_common/pico_atomic/include/ \
 	-isystem sdk/src/rp2_common/pico_bootrom/include/ \
 	-isystem sdk/src/rp2_common/pico_double/include/ \
+	-isystem sdk/src/rp2_common/pico_mem_ops/include/ \
 	-isystem sdk/src/rp2_common/pico_multicore/include/ \
 	-isystem sdk/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/include/ \
 	-isystem sdk/src/rp2_common/pico_stdio/include/ \
@@ -213,6 +214,165 @@ endif
 
 LIBS += -lc
 
+PICO_WRAP_FLOAT_AEABI_FLAGS := \
+	-Wl,--wrap=__aeabi_fadd \
+	-Wl,--wrap=__aeabi_fdiv \
+	-Wl,--wrap=__aeabi_fmul \
+	-Wl,--wrap=__aeabi_frsub \
+	-Wl,--wrap=__aeabi_fsub \
+	-Wl,--wrap=__aeabi_cfcmpeq \
+	-Wl,--wrap=__aeabi_cfrcmple \
+	-Wl,--wrap=__aeabi_cfcmple \
+	-Wl,--wrap=__aeabi_fcmpeq \
+	-Wl,--wrap=__aeabi_fcmplt \
+	-Wl,--wrap=__aeabi_fcmple \
+	-Wl,--wrap=__aeabi_fcmpge \
+	-Wl,--wrap=__aeabi_fcmpgt \
+	-Wl,--wrap=__aeabi_fcmpun \
+	-Wl,--wrap=__aeabi_i2f \
+	-Wl,--wrap=__aeabi_l2f \
+	-Wl,--wrap=__aeabi_ui2f \
+	-Wl,--wrap=__aeabi_ul2f \
+	-Wl,--wrap=__aeabi_f2iz \
+	-Wl,--wrap=__aeabi_f2lz \
+	-Wl,--wrap=__aeabi_f2uiz \
+	-Wl,--wrap=__aeabi_f2ulz \
+	-Wl,--wrap=__aeabi_f2d \
+	-Wl,--wrap=sqrtf
+
+PICO_WRAP_FLOAT_SCI_FLAGS := \
+	-Wl,--wrap=cosf \
+	-Wl,--wrap=sinf \
+	-Wl,--wrap=tanf \
+	-Wl,--wrap=atan2f \
+	-Wl,--wrap=expf \
+	-Wl,--wrap=logf \
+	-Wl,--wrap=ldexpf \
+	-Wl,--wrap=copysignf \
+	-Wl,--wrap=truncf \
+	-Wl,--wrap=floorf \
+	-Wl,--wrap=ceilf \
+	-Wl,--wrap=roundf \
+	-Wl,--wrap=sincosf \
+	-Wl,--wrap=asinf \
+	-Wl,--wrap=acosf \
+	-Wl,--wrap=atanf \
+	-Wl,--wrap=sinhf \
+	-Wl,--wrap=coshf \
+	-Wl,--wrap=tanhf \
+	-Wl,--wrap=asinhf \
+	-Wl,--wrap=acoshf \
+	-Wl,--wrap=atanhf \
+	-Wl,--wrap=exp2f \
+	-Wl,--wrap=log2f \
+	-Wl,--wrap=exp10f \
+	-Wl,--wrap=log10f \
+	-Wl,--wrap=powf \
+	-Wl,--wrap=powintf \
+	-Wl,--wrap=hypotf \
+	-Wl,--wrap=cbrtf \
+	-Wl,--wrap=fmodf \
+	-Wl,--wrap=dremf \
+	-Wl,--wrap=remainderf \
+	-Wl,--wrap=remquof \
+	-Wl,--wrap=expm1f \
+	-Wl,--wrap=log1pf \
+	-Wl,--wrap=fmaf
+
+PICO_WRAP_DOUBLE_FLAGS := \
+	-Wl,--wrap=__aeabi_dadd \
+	-Wl,--wrap=__aeabi_ddiv \
+	-Wl,--wrap=__aeabi_dmul \
+	-Wl,--wrap=__aeabi_drsub \
+	-Wl,--wrap=__aeabi_dsub \
+	-Wl,--wrap=__aeabi_cdcmpeq \
+	-Wl,--wrap=__aeabi_cdrcmple \
+	-Wl,--wrap=__aeabi_cdcmple \
+	-Wl,--wrap=__aeabi_dcmpeq \
+	-Wl,--wrap=__aeabi_dcmplt \
+	-Wl,--wrap=__aeabi_dcmple \
+	-Wl,--wrap=__aeabi_dcmpge \
+	-Wl,--wrap=__aeabi_dcmpgt \
+	-Wl,--wrap=__aeabi_dcmpun \
+	-Wl,--wrap=__aeabi_i2d \
+	-Wl,--wrap=__aeabi_l2d \
+	-Wl,--wrap=__aeabi_ui2d \
+	-Wl,--wrap=__aeabi_ul2d \
+	-Wl,--wrap=__aeabi_d2iz \
+	-Wl,--wrap=__aeabi_d2lz \
+	-Wl,--wrap=__aeabi_d2uiz \
+	-Wl,--wrap=__aeabi_d2ulz \
+	-Wl,--wrap=__aeabi_d2f \
+	-Wl,--wrap=sqrt \
+	-Wl,--wrap=cos \
+	-Wl,--wrap=sin \
+	-Wl,--wrap=tan \
+	-Wl,--wrap=atan2 \
+	-Wl,--wrap=exp \
+	-Wl,--wrap=log \
+	-Wl,--wrap=ldexp \
+	-Wl,--wrap=copysign \
+	-Wl,--wrap=trunc \
+	-Wl,--wrap=floor \
+	-Wl,--wrap=ceil \
+	-Wl,--wrap=round \
+	-Wl,--wrap=sincos \
+	-Wl,--wrap=asin \
+	-Wl,--wrap=acos \
+	-Wl,--wrap=atan \
+	-Wl,--wrap=sinh \
+	-Wl,--wrap=cosh \
+	-Wl,--wrap=tanh \
+	-Wl,--wrap=asinh \
+	-Wl,--wrap=acosh \
+	-Wl,--wrap=atanh \
+	-Wl,--wrap=exp2 \
+	-Wl,--wrap=log2 \
+	-Wl,--wrap=exp10 \
+	-Wl,--wrap=log10 \
+	-Wl,--wrap=pow \
+	-Wl,--wrap=powint \
+	-Wl,--wrap=hypot \
+	-Wl,--wrap=cbrt \
+	-Wl,--wrap=fmod \
+	-Wl,--wrap=drem \
+	-Wl,--wrap=remainder \
+	-Wl,--wrap=remquo \
+	-Wl,--wrap=expm1 \
+	-Wl,--wrap=log1p \
+	-Wl,--wrap=fma
+
+PICO_WRAP_MEM_OPS_FLAGS := \
+	-Wl,--wrap=memcpy \
+	-Wl,--wrap=memset \
+	-Wl,--wrap=__aeabi_memcpy \
+	-Wl,--wrap=__aeabi_memset \
+	-Wl,--wrap=__aeabi_memcpy4 \
+	-Wl,--wrap=__aeabi_memset4 \
+	-Wl,--wrap=__aeabi_memcpy8 \
+	-Wl,--wrap=__aeabi_memset8
+
+# Wrap a bunch of math stuff to use the Pico SDK divider
+OTHER_PICO_FLAGS := \
+	-Wl,--wrap=__aeabi_ldiv0 \
+	-Wl,--wrap=__aeabi_idiv0 \
+	-Wl,--wrap=__aeabi_lmul \
+	-Wl,--wrap=__clzsi2 \
+	-Wl,--wrap=__clzdi2 \
+	-Wl,--wrap=__ctzsi2 \
+	-Wl,--wrap=__ctzdi2 \
+	-Wl,--wrap=__popcountsi2 \
+	-Wl,--wrap=__popcountdi2 \
+	-Wl,--wrap=__clz \
+	-Wl,--wrap=__clzl \
+	-Wl,--wrap=__clzll \
+	-Wl,--wrap=__aeabi_idiv \
+	-Wl,--wrap=__aeabi_idivmod \
+	-Wl,--wrap=__aeabi_ldivmod \
+	-Wl,--wrap=__aeabi_uidiv \
+	-Wl,--wrap=__aeabi_uidivmod \
+	-Wl,--wrap=__aeabi_uldivmod
+
 ifeq ($(CHIP_VARIANT),RP2040)
 CFLAGS += \
 	-march=armv6-m \
@@ -229,7 +389,7 @@ SRC_SDK_CHIP_VARIANT := \
 	src/rp2_common/hardware_rtc/rtc.c \
 	src/rp2_common/pico_double/double_init_rom_rp2040.c \
 	src/rp2_common/pico_float/float_init_rom_rp2040.c \
-	src/rp2_common/pico_float/float_math.c \
+	src/rp2_common/pico_mem_ops/mem_ops.c \
 
 SRC_S_UPPER_CHIP_VARIANT := \
 	sdk/src/rp2_common/hardware_divider/divider.S \
@@ -239,155 +399,12 @@ SRC_S_UPPER_CHIP_VARIANT := \
 	sdk/src/rp2_common/pico_float/float_aeabi_rp2040.S \
 	sdk/src/rp2_common/pico_mem_ops/mem_ops_aeabi.S \
 
-# Wrap a bunch of math stuff to use the Pico SDK divider
-PICO_LDFLAGS += -Wl,--wrap=__aeabi_ldiv0 \
-								-Wl,--wrap=__aeabi_idiv0 \
-								-Wl,--wrap=__aeabi_lmul \
-								-Wl,--wrap=__clzsi2 \
-								-Wl,--wrap=__clzdi2 \
-								-Wl,--wrap=__ctzsi2 \
-								-Wl,--wrap=__ctzdi2 \
-								-Wl,--wrap=__popcountsi2 \
-								-Wl,--wrap=__popcountdi2 \
-								-Wl,--wrap=__clz \
-								-Wl,--wrap=__clzl \
-								-Wl,--wrap=__clzll \
-								-Wl,--wrap=__aeabi_idiv \
-								-Wl,--wrap=__aeabi_idivmod \
-								-Wl,--wrap=__aeabi_ldivmod \
-								-Wl,--wrap=__aeabi_uidiv \
-								-Wl,--wrap=__aeabi_uidivmod \
-								-Wl,--wrap=__aeabi_uldivmod \
-								-Wl,--wrap=__aeabi_dadd \
-								-Wl,--wrap=__aeabi_ddiv \
-								-Wl,--wrap=__aeabi_dmul \
-								-Wl,--wrap=__aeabi_drsub \
-								-Wl,--wrap=__aeabi_dsub \
-								-Wl,--wrap=__aeabi_cdcmpeq \
-								-Wl,--wrap=__aeabi_cdrcmple \
-								-Wl,--wrap=__aeabi_cdcmple \
-								-Wl,--wrap=__aeabi_dcmpeq \
-								-Wl,--wrap=__aeabi_dcmplt \
-								-Wl,--wrap=__aeabi_dcmple \
-								-Wl,--wrap=__aeabi_dcmpge \
-								-Wl,--wrap=__aeabi_dcmpgt \
-								-Wl,--wrap=__aeabi_dcmpun \
-								-Wl,--wrap=__aeabi_i2d \
-								-Wl,--wrap=__aeabi_l2d \
-								-Wl,--wrap=__aeabi_ui2d \
-								-Wl,--wrap=__aeabi_ul2d \
-								-Wl,--wrap=__aeabi_d2iz \
-								-Wl,--wrap=__aeabi_d2lz \
-								-Wl,--wrap=__aeabi_d2uiz \
-								-Wl,--wrap=__aeabi_d2ulz \
-								-Wl,--wrap=__aeabi_d2f \
-								-Wl,--wrap=sqrt \
-								-Wl,--wrap=cos \
-								-Wl,--wrap=sin \
-								-Wl,--wrap=tan \
-								-Wl,--wrap=atan2 \
-								-Wl,--wrap=exp \
-								-Wl,--wrap=log \
-								-Wl,--wrap=ldexp \
-								-Wl,--wrap=copysign \
-								-Wl,--wrap=trunc \
-								-Wl,--wrap=floor \
-								-Wl,--wrap=ceil \
-								-Wl,--wrap=round \
-								-Wl,--wrap=sincos \
-								-Wl,--wrap=asin \
-								-Wl,--wrap=acos \
-								-Wl,--wrap=atan \
-								-Wl,--wrap=sinh \
-								-Wl,--wrap=cosh \
-								-Wl,--wrap=tanh \
-								-Wl,--wrap=asinh \
-								-Wl,--wrap=acosh \
-								-Wl,--wrap=atanh \
-								-Wl,--wrap=exp2 \
-								-Wl,--wrap=log2 \
-								-Wl,--wrap=exp10 \
-								-Wl,--wrap=log10 \
-								-Wl,--wrap=pow \
-								-Wl,--wrap=powint \
-								-Wl,--wrap=hypot \
-								-Wl,--wrap=cbrt \
-								-Wl,--wrap=fmod \
-								-Wl,--wrap=drem \
-								-Wl,--wrap=remainder \
-								-Wl,--wrap=remquo \
-								-Wl,--wrap=expm1 \
-								-Wl,--wrap=log1p \
-								-Wl,--wrap=fma \
-								-Wl,--wrap=__aeabi_fadd \
-								-Wl,--wrap=__aeabi_fdiv \
-								-Wl,--wrap=__aeabi_fmul \
-								-Wl,--wrap=__aeabi_frsub \
-								-Wl,--wrap=__aeabi_fsub \
-								-Wl,--wrap=__aeabi_cfcmpeq \
-								-Wl,--wrap=__aeabi_cfrcmple \
-								-Wl,--wrap=__aeabi_cfcmple \
-								-Wl,--wrap=__aeabi_fcmpeq \
-								-Wl,--wrap=__aeabi_fcmplt \
-								-Wl,--wrap=__aeabi_fcmple \
-								-Wl,--wrap=__aeabi_fcmpge \
-								-Wl,--wrap=__aeabi_fcmpgt \
-								-Wl,--wrap=__aeabi_fcmpun \
-								-Wl,--wrap=__aeabi_i2f \
-								-Wl,--wrap=__aeabi_l2f \
-								-Wl,--wrap=__aeabi_ui2f \
-								-Wl,--wrap=__aeabi_ul2f \
-								-Wl,--wrap=__aeabi_f2iz \
-								-Wl,--wrap=__aeabi_f2lz \
-								-Wl,--wrap=__aeabi_f2uiz \
-								-Wl,--wrap=__aeabi_f2ulz \
-								-Wl,--wrap=__aeabi_f2d \
-								-Wl,--wrap=sqrtf \
-								-Wl,--wrap=cosf \
-								-Wl,--wrap=sinf \
-								-Wl,--wrap=tanf \
-								-Wl,--wrap=atan2f \
-								-Wl,--wrap=expf \
-								-Wl,--wrap=logf \
-								-Wl,--wrap=ldexpf \
-								-Wl,--wrap=copysignf \
-								-Wl,--wrap=truncf \
-								-Wl,--wrap=floorf \
-								-Wl,--wrap=ceilf \
-								-Wl,--wrap=roundf \
-								-Wl,--wrap=sincosf \
-								-Wl,--wrap=asinf \
-								-Wl,--wrap=acosf \
-								-Wl,--wrap=atanf \
-								-Wl,--wrap=sinhf \
-								-Wl,--wrap=coshf \
-								-Wl,--wrap=tanhf \
-								-Wl,--wrap=asinhf \
-								-Wl,--wrap=acoshf \
-								-Wl,--wrap=atanhf \
-								-Wl,--wrap=exp2f \
-								-Wl,--wrap=log2f \
-								-Wl,--wrap=exp10f \
-								-Wl,--wrap=log10f \
-								-Wl,--wrap=powf \
-								-Wl,--wrap=powintf \
-								-Wl,--wrap=hypotf \
-								-Wl,--wrap=cbrtf \
-								-Wl,--wrap=fmodf \
-								-Wl,--wrap=dremf \
-								-Wl,--wrap=remainderf \
-								-Wl,--wrap=remquof \
-								-Wl,--wrap=expm1f \
-								-Wl,--wrap=log1pf \
-								-Wl,--wrap=fmaf \
-								-Wl,--wrap=memcpy \
-								-Wl,--wrap=memset \
-								-Wl,--wrap=__aeabi_memcpy \
-								-Wl,--wrap=__aeabi_memset \
-								-Wl,--wrap=__aeabi_memcpy4 \
-								-Wl,--wrap=__aeabi_memset4 \
-								-Wl,--wrap=__aeabi_memcpy8 \
-								-Wl,--wrap=__aeabi_memset8
+PICO_LDFLAGS += \
+	$(PICO_WRAP_FLOAT_AEABI_FLAGS) \
+	$(PICO_WRAP_FLOAT_SCI_FLAGS) \
+	$(PICO_WRAP_DOUBLE_FLAGS) \
+	$(PICO_WRAP_MEM_OPS_FLAGS) \
+	$(OTHER_PICO_FLAGS)
 
 UF2_ID = 0xE48BFF56
 
@@ -414,6 +431,15 @@ CFLAGS += -DPICO_RP2350=1
 SRC_SDK_CHIP_VARIANT := \
 	src/rp2_common/hardware_powman/powman.c \
 
+SRC_S_UPPER_CHIP_VARIANT := \
+	sdk/src/rp2_common/pico_double/double_conv_m33.S \
+	sdk/src/rp2_common/pico_double/double_fma_dcp.S \
+	sdk/src/rp2_common/pico_double/double_sci_m33.S \
+	sdk/src/rp2_common/pico_float/float_sci_m33_vfp.S \
+	sdk/src/rp2_common/pico_float/float_conv_m33.S \
+
+PICO_LDFLAGS += $(PICO_WRAP_FLOAT_SCI_FLAGS) $(PICO_WRAP_DOUBLE_FLAGS)
+
 ifeq ($(CHIP_PACKAGE),A)
 CFLAGS += -DPICO_RP2350A=1
 CFLAGS += -DPICO_RP2350B=0
@@ -460,6 +486,7 @@ SRC_SDK := \
 	src/rp2_common/pico_bootsel_via_double_reset/pico_bootsel_via_double_reset.c \
 	src/rp2_common/pico_clib_interface/newlib_interface.c \
 	src/rp2_common/pico_fix/rp2040_usb_device_enumeration/rp2040_usb_device_enumeration.c \
+	src/rp2_common/pico_float/float_math.c \
 	src/rp2_common/pico_multicore/multicore.c \
 	src/rp2_common/pico_platform_panic/panic.c \
 	src/rp2_common/pico_printf/printf.c \

ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.mk

@@ -11,7 +11,6 @@ EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
 
 CIRCUITPY_ALARM = 0
 CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_USB_HOST = 0
 
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_PICODVI = 1

ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk

@@ -11,4 +11,3 @@ EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
 
 CIRCUITPY_ALARM = 0
 CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_USB_HOST = 0

ports/raspberrypi/boards/cytron_iriv_io_controller/mpconfigboard.mk

@@ -12,7 +12,6 @@ EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 CIRCUITPY__EVE = 1
 CIRCUITPY_ALARM = 0
 CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_USB_HOST = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleIO

ports/raspberrypi/boards/cytron_motion_2350_pro/mpconfigboard.mk

@@ -12,7 +12,6 @@ EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 CIRCUITPY__EVE = 1
 CIRCUITPY_ALARM = 0
 CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_USB_HOST = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel