Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KL27Z: Fix duplicate define error #2400

Merged
merged 1 commit into from
Aug 12, 2016

Conversation

mmahadevan108
Copy link
Contributor

Signed-off-by: Mahadevan Mahesh [email protected]

Signed-off-by: Mahadevan Mahesh <[email protected]>
@@ -168,7 +168,7 @@ void SPI_MasterTransferCreateHandleDMA(SPI_Type *base,
handle->bytesPerFrame = 1U;
#endif /* FSL_FEATURE_SPI_16BIT_TRANSFERS */

#if defined(FSL_FEATURE_SPI_FIFO_SIZE) && (FSL_FEATURE_SPI_FIFO_SIZE > 1)
#if defined(FSL_FEATURE_SPI_HAS_FIFO) && (FSL_FEATURE_SPI_HAS_FIFO)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

both are the same?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The old code was using a macro that is not available.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I missed first check is defined, the second is checking if it's set to non zero value. ;) All good

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had discussed about this, however there were some use-cases which required this.

I do not want to make changes that deviates from the SDK code base.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@theotherjimmy It's correct but some compilers create a warning, that a macro is not defined (we had this problem with some cortex cmsis defines).

@mmahadevan108
Copy link
Contributor Author

Any update?

@0xc0170 0xc0170 merged commit 0b74dc1 into ARMmbed:master Aug 12, 2016
@mmahadevan108 mmahadevan108 deleted the Fix_Duplicate_Define_KL27Z branch August 22, 2016 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants