diff options
| author | hathach <[email protected]> | 2024-12-11 16:20:02 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2024-12-11 16:20:02 +0700 |
| commit | 91799b0df5d3a33499a798af07f5dfd18d8dba3b (patch) | |
| tree | c4c53001e390131a4bde94d632d67e4a9a9f962d | |
| parent | 29fa07d2ad774181877a311e8c0770195a020b3b (diff) | |
| parent | 7c7b30f0ae66a856ada3526cb947bd3a255567f8 (diff) | |
Merge branch 'master' into fork/HiFiPhile/rt1170
| -rw-r--r-- | .circleci/config.yml | 6 | ||||
| -rw-r--r-- | src/portable/synopsys/dwc2/dcd_dwc2.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 451b79085..fd5631e2e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,6 @@ jobs: BUILDSYSTEM_TOOLCHAIN=( "cmake arm-clang" - "cmake arm-iar" "make aarch64-gcc" "make arm-gcc" "make msp430-gcc" @@ -29,6 +28,11 @@ jobs: "cmake esp-idf" ) + # only build IAR if not forked PR, since IAR token is not shared + if [ -z $CIRCLE_PR_USERNAME ]; then + BUILDSYSTEM_TOOLCHAIN+=("cmake arm-iar") + fi + RESOURCE_LARGE='["nrf", "imxrt", "stm32f4", "stm32h7"]' gen_build_entry() { diff --git a/src/portable/synopsys/dwc2/dcd_dwc2.c b/src/portable/synopsys/dwc2/dcd_dwc2.c index bde48ef57..c461d9a79 100644 --- a/src/portable/synopsys/dwc2/dcd_dwc2.c +++ b/src/portable/synopsys/dwc2/dcd_dwc2.c @@ -44,7 +44,7 @@ #if TU_CHECK_MCU(OPT_MCU_GD32VF103) #define DWC2_EP_COUNT(_dwc2) DWC2_EP_MAX #else - #define DWC2_EP_COUNT(_dwc2) ((_dwc2)->ghwcfg2_bm.num_dev_ep) + #define DWC2_EP_COUNT(_dwc2) ((_dwc2)->ghwcfg2_bm.num_dev_ep + 1) #endif //--------------------------------------------------------------------+ |