Merge remote-tracking branch 'tinyusb/master' into n6_build

Signed-off-by: Zixun LI <[email protected]>

Author: HiFiPhile

.PVS-Studio/.pvsconfig

@@ -0,0 +1,19 @@
+//V_EXCLUDE_PATH */iar/cxarm*
+//V_EXCLUDE_PATH */pico-sdk/*
+//V_EXCLUDE_PATH */esp-idf/*
+//V_EXCLUDE_PATH */hw/mcu/*
+//V_EXCLUDE_PATH */hw/bsp/espressif/components/*
+//V_EXCLUDE_PATH */lib/*
+
+//-V::2506 MISRA. A function should have a single point of exit at the end.
+//-V::2514 MISRA. Unions should not be used.
+//-V::2520 [MISRA-C-16.3] Every switch-clause should be terminated by an unconditional 'break' statement
+//-V:memcpy:2547 [MISRA-C-17.7] The return value of non-void function 'memcpy' should be used.
+//-V:memmove:2547 [MISRA-C-17.7] The return value of non-void function 'memmove' should be used.
+//-V:printf:2547 [MISRA-C-17.7]
+//-V::2584::{gintsts} dwc2 interrupt handler
+//-V::2584::{hcint} dwc2 interrupt handler
+//-V::2600 [MISRA-C-21.6] The function with the 'printf' name should not be used.
+//+V2614 DISABLE_LENGHT_LIMIT_CHECK:YES
+//-V:memcpy:2628 Pointer arguments to the 'memcpy' function should be pointers to qualified or unqualified versions of compatible types.
+//-V::2659 [MISRA-C-16.1] Switch statements should be well-formed. Every switch-clause should be terminated by an unconditional 'break' statement

.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

@@ -34,6 +34,7 @@ commands:
                 chmod +x toolchain.run
                 ./toolchain.run -p ~/cache/<< parameters.toolchain >>/gnurx -y
               elif [[ << parameters.toolchain >> == arm-iar ]]; then
+                wget --progress=dot:giga https://netstorage.iar.com/FileStore/STANDARD/001/003/926/iar-lmsc-tools_1.8_amd64.deb -O ~/cache/<< parameters.toolchain >>/iar-lmsc-tools.deb
                 wget --progress=dot:giga $toolchain_url -O ~/cache/<< parameters.toolchain >>/toolchain.deb
               else
                 wget --progress=dot:giga $toolchain_url -O toolchain.tar.gz
@@ -44,6 +45,7 @@ commands:
             # Add toolchain to PATH
             if [[ << parameters.toolchain >> == arm-iar ]]; then
               # Install IAR since we only cache deb file
+              sudo dpkg -i ~/cache/<< parameters.toolchain >>/iar-lmsc-tools.deb
               sudo dpkg --ignore-depends=libusb-1.0-0 -i ~/cache/<< parameters.toolchain >>/toolchain.deb
               echo "export PATH=$PATH:/opt/iar/cxarm/arm/bin" >> $BASH_ENV
             else
@@ -102,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 >>
@@ -125,7 +128,7 @@ jobs:
     parameters:
       resource_class:
         type: string
-        default: medium+
+        default: large
       build-system:
         type: string
       toolchain:

.clang-format

@@ -1,66 +1,99 @@
-# Generated from CLion C/C++ Code Style settings
+---
+Language: Cpp
 BasedOnStyle: LLVM
-AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: None
-AlignOperands: Align
+AlignConsecutiveAssignments:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+AlignConsecutiveBitFields:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+AlignConsecutiveDeclarations:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: false
+AlignConsecutiveShortCaseStatements:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: true
+  AlignCaseColons: false
+AlignEscapedNewlines: LeftWithLastLine
+AlignOperands: true
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 2
 AllowAllArgumentsOnNextLine: false
 AllowAllConstructorInitializersOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: Always
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseExpressionOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Always
-AllowShortLambdasOnASingleLine: All
-AllowShortLoopsOnASingleLine: true
-AlwaysBreakAfterReturnType: None
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
 AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: true
 BreakBeforeBraces: Custom
 BraceWrapping:
   AfterCaseLabel: false
   AfterClass: false
-  AfterControlStatement: Never
+  AfterControlStatement: false
   AfterEnum: false
   AfterFunction: false
   AfterNamespace: false
+  AfterStruct: false
   AfterUnion: false
-  BeforeCatch: false
+  AfterExternBlock: false
+  BeforeCatch: true
   BeforeElse: false
-  IndentBraces: false
-  SplitEmptyFunction: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  SplitEmptyFunction: true
   SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BracedInitializerIndentWidth: 2
 BreakBeforeBinaryOperators: None
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: BeforeColon
-BreakInheritanceList: BeforeColon
-ColumnLimit: 0
-CompactNamespaces: false
-ContinuationIndentWidth: 4
-IndentCaseLabels: true
+BreakConstructorInitializers: AfterColon
+BreakConstructorInitializersBeforeComma: false
+ContinuationIndentWidth: 2
+ColumnLimit: 120
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+Cpp11BracedListStyle: true
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex: '^<.*'
+    Priority: 1
+  - Regex: '^".*'
+    Priority: 2
+  - Regex: '.*'
+    Priority: 3
+IncludeIsMainRegex: '([-_](test|unittest))?$'
 IndentPPDirectives: BeforeHash
-IndentWidth: 2
-KeepEmptyLinesAtTheStartOfBlocks: true
+InsertBraces: true
+IndentCaseLabels: true
+InsertNewlineAtEOF: true
+MacroBlockBegin: ''
+MacroBlockEnd: ''
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: All
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PointerAlignment: Right
+PenaltyBreakBeforeFirstCallParameter: 1000000
+PenaltyBreakOpenParenthesis: 1000000
+QualifierAlignment: Custom
+QualifierOrder: ['static', 'const', 'volatile', 'restrict', 'type']
 ReflowComments: false
-SpaceAfterCStyleCast: true
-SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: false
 SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 0
 SpacesInAngles: false
+SpacesInConditionalStatement: false
 SpacesInCStyleCastParentheses: false
-SpacesInContainerLiterals: true
 SpacesInParentheses: false
-SpacesInSquareBrackets: false
+SortIncludes: false
 TabWidth: 2
-UseTab: Never
+...

.github/actions/get_deps/action.yml

@@ -19,11 +19,16 @@ runs:
     - name: Linux dependencies
       if: runner.os == 'Linux'
       run: |
-        sudo apt install -y ninja-build
+        NINJA_URL=https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-linux.zip
+        wget $NINJA_URL -O ninja-linux.zip
+        unzip ninja-linux.zip -d ninja-bin
+        echo >> $GITHUB_PATH "${{ github.workspace }}/ninja-bin"
       shell: bash
 
     - name: Get Dependencies
+      env:
+        ARG: ${{ inputs.arg }}
       run: |
-        python3 tools/get_deps.py ${{ inputs.arg }}
+        python3 tools/get_deps.py ${ARG}
         echo "PICO_SDK_PATH=${{ github.workspace }}/pico-sdk" >> $GITHUB_ENV
       shell: bash

.github/actions/setup_toolchain/action.yml

@@ -30,8 +30,10 @@ runs:
         inputs.toolchain != 'arm-gcc' &&
         inputs.toolchain != 'esp-idf'
       id: set-toolchain-url
+      env:
+        TOOLCHAIN: ${{ inputs.toolchain }}
       run: |
-        TOOLCHAIN_URL=$(jq -r '."${{ inputs.toolchain }}"' .github/actions/setup_toolchain/toolchain.json)
+        TOOLCHAIN_URL=$(jq -r --arg tc "$TOOLCHAIN" '.[$tc]' .github/actions/setup_toolchain/toolchain.json)
         echo "toolchain_url=$TOOLCHAIN_URL"
         echo "toolchain_url=$TOOLCHAIN_URL" >> $GITHUB_OUTPUT
       shell: bash
@@ -47,11 +49,13 @@ runs:
 
     - name: Set toolchain option
       id: set-toolchain-option
+      env:
+        TOOLCHAIN: ${{ inputs.toolchain }}
       run: |
           BUILD_OPTION=""
-          if [[ "${{ inputs.toolchain }}" == *"clang"* ]]; then
+          if [[ "$TOOLCHAIN" == *"clang"* ]]; then
             BUILD_OPTION="--toolchain clang"
-          elif [[ "${{ inputs.toolchain }}" == "arm-iar" ]]; then
+          elif [[ "$TOOLCHAIN" == "arm-iar" ]]; then
             BUILD_OPTION="--toolchain iar"
           fi
           echo "build_option=$BUILD_OPTION"

.github/actions/setup_toolchain/download/action.yml

@@ -21,27 +21,34 @@ runs:
 
     - name: Install Toolchain
       if: steps.cache-toolchain-download.outputs.cache-hit != 'true'
+      env:
+        TOOLCHAIN: ${{ inputs.toolchain }}
+        TOOLCHAIN_URL: ${{ inputs.toolchain_url }}
       run: |
-        mkdir -p ~/cache/${{ inputs.toolchain }}
+        mkdir -p ~/cache/${TOOLCHAIN}
 
-        if [[ ${{ inputs.toolchain }} == rx-gcc ]]; then
-          wget --progress=dot:giga ${{ inputs.toolchain_url }} -O toolchain.run
+        if [[ ${TOOLCHAIN} == rx-gcc ]]; then
+          wget --progress=dot:giga ${TOOLCHAIN_URL} -O toolchain.run
           chmod +x toolchain.run
-          ./toolchain.run -p ~/cache/${{ inputs.toolchain }}/gnurx -y
-        elif [[ ${{ inputs.toolchain }} == arm-iar ]]; then
-          wget --progress=dot:giga ${{ inputs.toolchain_url }} -O ~/cache/${{ inputs.toolchain }}/cxarm.deb
+          ./toolchain.run -p ~/cache/${TOOLCHAIN}/gnurx -y
+        elif [[ ${TOOLCHAIN} == arm-iar ]]; then
+          wget --progress=dot:giga https://netstorage.iar.com/FileStore/STANDARD/001/003/926/iar-lmsc-tools_1.8_amd64.deb -O ~/cache/${TOOLCHAIN}/iar-lmsc-tools.deb
+          wget --progress=dot:giga ${TOOLCHAIN_URL} -O ~/cache/${TOOLCHAIN}/cxarm.deb
         else
-          wget --progress=dot:giga ${{ inputs.toolchain_url }} -O toolchain.tar.gz
-          tar -C ~/cache/${{ inputs.toolchain }} -xaf toolchain.tar.gz
+          wget --progress=dot:giga ${TOOLCHAIN_URL} -O toolchain.tar.gz
+          tar -C ~/cache/${TOOLCHAIN} -xaf toolchain.tar.gz
         fi
       shell: bash
 
     - name: Setup Toolchain
+      env:
+        TOOLCHAIN: ${{ inputs.toolchain }}
       run: |
-        if [[ ${{ inputs.toolchain }} == arm-iar ]]; then
-          sudo apt-get install -y ~/cache/${{ inputs.toolchain }}/cxarm.deb
+        if [[ ${TOOLCHAIN} == arm-iar ]]; then
+          sudo dpkg -i ~/cache/${TOOLCHAIN}/iar-lmsc-tools.deb
+          sudo apt install -y ~/cache/${TOOLCHAIN}/cxarm.deb
           echo >> $GITHUB_PATH "/opt/iar/cxarm/arm/bin"
         else
-          echo >> $GITHUB_PATH `echo ~/cache/${{ inputs.toolchain }}/*/bin`
+          echo >> $GITHUB_PATH `echo ~/cache/${TOOLCHAIN}/*/bin`
         fi
       shell: bash

.github/actions/setup_toolchain/espressif/action.yml

@@ -13,8 +13,10 @@ runs:
   using: "composite"
   steps:
     - name: Set DOCKER_ESP_IDF
+      env:
+        TOOLCHAIN: ${{ inputs.toolchain }}
       run: |
-        DOCKER_ESP_IDF=$HOME/cache/${{ inputs.toolchain }}/docker_image.tar
+        DOCKER_ESP_IDF=$HOME/cache/${TOOLCHAIN}/docker_image.tar
         echo "DOCKER_ESP_IDF=$DOCKER_ESP_IDF" >> $GITHUB_ENV
       shell: bash
 
@@ -27,10 +29,12 @@ runs:
 
     - name: Pull and Save Docker Image
       if: steps.cache-toolchain-espressif.outputs.cache-hit != 'true'
+      env:
+        TOOLCHAIN_VERSION: ${{ inputs.toolchain_version }}
       run: |
-        docker pull espressif/idf:${{ inputs.toolchain_version }}
+        docker pull espressif/idf:${TOOLCHAIN_VERSION}
         mkdir -p $(dirname $DOCKER_ESP_IDF)
-        docker save -o $DOCKER_ESP_IDF espressif/idf:${{ inputs.toolchain_version }}
+        docker save -o $DOCKER_ESP_IDF espressif/idf:${TOOLCHAIN_VERSION}
         du -sh $DOCKER_ESP_IDF
       shell: bash
 
@@ -42,7 +46,9 @@ runs:
       shell: bash
 
     - name: Tag Local Image
+      env:
+        TOOLCHAIN_VERSION: ${{ inputs.toolchain_version }}
       run: |
-        docker tag espressif/idf:${{ inputs.toolchain_version }} espressif/idf:tinyusb
+        docker tag espressif/idf:${TOOLCHAIN_VERSION} espressif/idf:tinyusb
         docker images
       shell: bash

.github/actions/setup_toolchain/toolchain.json

@@ -5,5 +5,5 @@
   "msp430-gcc": "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/9_2_0_0/export/msp430-gcc-9.2.0.50_linux64.tar.bz2",
   "riscv-gcc": "https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/xpack-riscv-none-elf-gcc-13.2.0-2-linux-x64.tar.gz",
   "rx-gcc": "https://github.com/hathach/rx_device/releases/download/0.0.1/gcc-8.3.0.202411-GNURX-ELF.run",
-  "arm-iar": "https://netstorage.iar.com/FileStore/STANDARD/001/003/583/cxarm-9.60.4.deb"
+  "arm-iar": "https://netstorage.iar.com/FileStore/STANDARD/001/003/723/cxarm-9.70.1.deb"
 }