diff options
| author | Man, Jianting (Meco) <[email protected]> | 2023-02-25 13:52:37 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-02-25 13:52:37 -0500 |
| commit | 1acef4277b02e5084310ecd7028656ae535178f5 (patch) | |
| tree | 03b6b6f0b3df75a1cef301e1e7b2b3d234213390 /bsp/Infineon/libraries | |
| parent | 759192f5f5af23ae360818483d35974ef5b91c78 (diff) | |
| parent | e63e33a3c64327aef3556fa811df0a8ec1e0e7ee (diff) | |
Merge pull request #6981 from RT-Thread/masterserialX-dev
sync from master
Diffstat (limited to 'bsp/Infineon/libraries')
| -rw-r--r-- | bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/include_pvt/cyhal_scb_common.h | 2 | ||||
| -rw-r--r-- | bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/source/cyhal_scb_common.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/include_pvt/cyhal_scb_common.h b/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/include_pvt/cyhal_scb_common.h index ffaf754bc9..df766444e5 100644 --- a/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/include_pvt/cyhal_scb_common.h +++ b/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/include_pvt/cyhal_scb_common.h @@ -46,7 +46,7 @@ extern "C" { #endif #if defined(CY_IP_MXSCB_INSTANCES) -#if defined(CY_DEVICE_PSOC6A256K) +#if defined(CY_DEVICE_PSOC6A256K) || defined(CY8C624ALQI_S2D42) //Special case for 256k device which has 6 SCBs numbered 0, 1, 2, 4, 5, 6 #define _SCB_ARRAY_SIZE (CY_IP_MXSCB_INSTANCES + 1) #else diff --git a/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/source/cyhal_scb_common.c b/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/source/cyhal_scb_common.c index b507ba3547..30600d3937 100644 --- a/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/source/cyhal_scb_common.c +++ b/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/source/cyhal_scb_common.c @@ -51,7 +51,7 @@ CySCB_Type *const _CYHAL_SCB_BASE_ADDRESSES[_SCB_ARRAY_SIZE] = #endif #ifdef SCB3 SCB3, -#elif defined(CY_DEVICE_PSOC6A256K) +#elif defined(CY_DEVICE_PSOC6A256K) || defined(CY8C624ALQI_S2D42) NULL, // Placeholder #endif #ifdef SCB4 |