Merge pull request #3345 from hathach/update-iso-alloc

make dcd_edpt_iso_alloc/activate as default API for ISO endpoint

Author: hathach

.circleci/config.yml

@@ -32,8 +32,6 @@ jobs:
               BUILDSYSTEM_TOOLCHAIN+=("cmake arm-iar")
             fi
 
-            RESOURCE_LARGE='["nrf", "imxrt", "stm32f4", "stm32h7 stm32h7rs"]'
-
             gen_build_entry() {
               local build_system="$1"
               local toolchain="$2"
@@ -61,21 +59,7 @@ jobs:
               FAMILY=$(echo $MATRIX_JSON | jq -r ".\"$toolchain\"")
               echo "FAMILY_${toolchain}=$FAMILY"
 
-              # FAMILY_LARGE = FAMILY - RESOURCE_LARGE
-              # Separate large from medium+ resources
-              FAMILY_LARGE=$(jq -n --argjson family "$FAMILY" --argjson resource "$RESOURCE_LARGE" '$family | map(select(IN($resource[])))')
-              FAMILY=$(jq -n --argjson family "$FAMILY" --argjson resource "$RESOURCE_LARGE" '$family | map(select(IN($resource[]) | not))')
-
-              if [[ $toolchain == esp-idf || $toolchain == arm-iar ]]; then
-                gen_build_entry "$build_system" "$toolchain" "$FAMILY" "large"
-              else
-                gen_build_entry "$build_system" "$toolchain" "$FAMILY" "medium+"
-
-                # add large resources if available
-                if [ "$(echo $FAMILY_LARGE | jq 'length')" -gt 0 ]; then
-                    gen_build_entry "$build_system" "$toolchain" "$FAMILY_LARGE" "large"
-                fi
-              fi
+              gen_build_entry "$build_system" "$toolchain" "$FAMILY" "large"
             done
 
       - continuation/continue:

.circleci/config2.yml

@@ -104,6 +104,7 @@ commands:
 
       - run:
           name: Build
+          no_output_timeout: 20m
           command: |
             if [ << parameters.toolchain >> == esp-idf ]; then
               docker run --rm -v $PWD:/project -w /project espressif/idf:v5.3.2 python tools/build.py << parameters.family >>
@@ -127,7 +128,7 @@ jobs:
     parameters:
       resource_class:
         type: string
-        default: medium+
+        default: large
       build-system:
         type: string
       toolchain:

docs/porting.rst

@@ -173,12 +173,22 @@ Also make sure to enable endpoint specific interrupts.
 ``dcd_edpt_close()``
 """"""""""""""""""""
 
+.. warning::
+   This function is deprecated, ISO transfer should implement dcd_edpt_iso_alloc() and dcd_edpt_iso_activate() instead.
+
 Close an endpoint. his function is used for implementing alternate settings.
 
 After calling this, the device should not respond to any packets directed towards this endpoint. When called, this function must abort any transfers in progress through this endpoint, before returning.
 
 Implementation is optional. Must be called from the USB task. Interrupts could be disabled or enabled during the call.
 
+``dcd_edpt_iso_alloc() / dcd_edpt_iso_activate()``
+""""""""""""""""""""""""""""""""""""""""""""""""""
+
+dcd_edpt_iso_alloc() is used to allocate largest buffer (for all alternative interfaces) for ISO endpoints when device is enumerated. This allows DCD to allocate necessary resources for ISO endpoints in the future.
+
+dcd_edpt_iso_activate() is used to activate or deactivate ISO endpoint when alternate setting is set with active max packet size.
+
 ``dcd_edpt_xfer()``
 """""""""""""""""""
 

examples/device/video_capture/skip.txt

@@ -1,6 +1,5 @@
 mcu:CH32V103
 mcu:CH32V20X
-mcu:MCXA15
 mcu:MSP430x5xx
 mcu:NUC121
 mcu:SAMD11

examples/device/video_capture_2ch/skip.txt

@@ -6,7 +6,6 @@ mcu:CH32V103
 mcu:CH32V20X
 mcu:CH32V307
 mcu:STM32L0
-mcu:MCXA15
 family:espressif
 board:curiosity_nano
 board:kuiic

hw/bsp/family_support.cmake

@@ -264,6 +264,9 @@ function(family_configure_common TARGET RTOS)
         ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
         SKIP_LINTING ON # need cmake 4.2
         )
+      if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+        set_target_properties(${BOARD_TARGET} PROPERTIES COMPILE_OPTIONS -w)
+      endif ()
     endif ()
     target_link_libraries(${TARGET} PUBLIC ${BOARD_TARGET})
   endif ()

hw/bsp/mcx/boards/frdm_mcxa153/board.cmake

@@ -14,8 +14,11 @@ function(update_board TARGET)
     BOARD_TUD_MAX_SPEED=OPT_MODE_FULL_SPEED
     CFG_EXAMPLE_VIDEO_READONLY
     )
-  target_sources(${TARGET} PUBLIC
-    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clock_config.c
-    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/pin_mux.c
+  target_sources(${TARGET} PRIVATE
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/board/clock_config.c
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/board/pin_mux.c
+    )
+  target_include_directories(${TARGET} PUBLIC
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/board
     )
 endfunction()

hw/bsp/mcx/boards/frdm_mcxa153/board.mk

@@ -6,6 +6,14 @@ CPU_CORE = cortex-m33-nodsp-nofp
 CFLAGS += \
 	-DCPU_MCXA153VLH \
 	-DCFG_TUSB_MCU=OPT_MCU_MCXA15 \
+	-DCFG_EXAMPLE_VIDEO_READONLY
+
+SRC_C += \
+  ${BOARD_PATH}/board/clock_config.c \
+  ${BOARD_PATH}/board/pin_mux.c
+
+INC += \
+	$(TOP)/$(BOARD_PATH)/board
 
 JLINK_DEVICE = MCXA153
 PYOCD_TARGET = MCXA153