Skip to content

Commit 442fa6b

Browse files
DerekSnelldleach02
authored andcommitted
mcux_sai: FSL_FEATURE_SAI_HAS_ON_DEMAND_MODE
corrected macro name in fsl_sai driver to match *_features.h headers Signed-off-by: Derek Snell <[email protected]>
1 parent 072bf81 commit 442fa6b

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

mcux/README

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,7 @@ Patch List:
8080
* mcux: Add support for mimxrt1050_evk_qspi. The following files were added by this commit:
8181
mcux/mcux-sdk/boards/evkbimxrt1050/xip/driver_xip_board_evkbimxrt1050_qspi.cmake
8282
mcux/mcux-sdk/boards/evkbimxrt1050/xip/evkbimxrt1050_flexspi_nor_qspi_config.c
83+
84+
* Fix macro name for I2s/SAI driver FSL_FEATURE_SAI_HAS_ON_DEMAND_MODE. The following file are touched by this commit:
85+
mcux/mcux-sdk/drivers/sai/fsl_sai.c
86+
mcux/mcux-sdk/drivers/sai/fsl_sai.h

mcux/mcux-sdk/drivers/sai/fsl_sai.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ static void SAI_GetCommonConfig(sai_transceiver_t *config,
363363
/* frame sync default configurations */
364364
config->frameSync.frameSyncWidth = (uint8_t)bitWidth;
365365
config->frameSync.frameSyncEarly = true;
366-
#if defined(FSL_FEATURE_SAI_HAS_FRAME_SYNC_ON_DEMAND) && FSL_FEATURE_SAI_HAS_FRAME_SYNC_ON_DEMAND
366+
#if defined(FSL_FEATURE_SAI_HAS_ON_DEMAND_MODE) && FSL_FEATURE_SAI_HAS_ON_DEMAND_MODE
367367
config->frameSync.frameSyncGenerateOnDemand = false;
368368
#endif
369369
config->frameSync.frameSyncPolarity = kSAI_PolarityActiveLow;
@@ -1318,7 +1318,7 @@ void SAI_TxSetFrameSyncConfig(I2S_Type *base, sai_master_slave_t masterSlave, sa
13181318

13191319
tcr4 &= ~(I2S_TCR4_FSE_MASK | I2S_TCR4_FSP_MASK | I2S_TCR4_FSD_MASK | I2S_TCR4_SYWD_MASK);
13201320

1321-
#if defined(FSL_FEATURE_SAI_HAS_FRAME_SYNC_ON_DEMAND) && FSL_FEATURE_SAI_HAS_FRAME_SYNC_ON_DEMAND
1321+
#if defined(FSL_FEATURE_SAI_HAS_ON_DEMAND_MODE) && FSL_FEATURE_SAI_HAS_ON_DEMAND_MODE
13221322
tcr4 &= ~I2S_TCR4_ONDEM_MASK;
13231323
tcr4 |= I2S_TCR4_ONDEM(config->frameSyncGenerateOnDemand);
13241324
#endif
@@ -1347,7 +1347,7 @@ void SAI_RxSetFrameSyncConfig(I2S_Type *base, sai_master_slave_t masterSlave, sa
13471347

13481348
rcr4 &= ~(I2S_RCR4_FSE_MASK | I2S_RCR4_FSP_MASK | I2S_RCR4_FSD_MASK | I2S_RCR4_SYWD_MASK);
13491349

1350-
#if defined(FSL_FEATURE_SAI_HAS_FRAME_SYNC_ON_DEMAND) && FSL_FEATURE_SAI_HAS_FRAME_SYNC_ON_DEMAND
1350+
#if defined(FSL_FEATURE_SAI_HAS_ON_DEMAND_MODE) && FSL_FEATURE_SAI_HAS_ON_DEMAND_MODE
13511351
rcr4 &= ~I2S_RCR4_ONDEM_MASK;
13521352
rcr4 |= I2S_RCR4_ONDEM(config->frameSyncGenerateOnDemand);
13531353
#endif

mcux/mcux-sdk/drivers/sai/fsl_sai.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ typedef struct _sai_frame_sync
365365
bool frameSyncEarly; /*!< TRUE is frame sync assert one bit before the first bit of frame
366366
FALSE is frame sync assert with the first bit of the frame */
367367

368-
#if defined(FSL_FEATURE_SAI_HAS_FRAME_SYNC_ON_DEMAND) && FSL_FEATURE_SAI_HAS_FRAME_SYNC_ON_DEMAND
368+
#if defined(FSL_FEATURE_SAI_HAS_ON_DEMAND_MODE) && FSL_FEATURE_SAI_HAS_ON_DEMAND_MODE
369369
bool frameSyncGenerateOnDemand; /*!< internal frame sync is generated when FIFO waring flag is clear */
370370
#endif
371371

0 commit comments

Comments
 (0)