Fix error introduced when merging #264. #286
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
milesfrain
reviewed
Mar 22, 2021
| volatile size_t xOriginalTail; | ||
| size_t xOriginalTail; |
There was a problem hiding this comment.
Context: #264 (comment)
milesfrain
reviewed
Mar 22, 2021
| if( xDataLengthBytes != xRequiredSpace ) | ||
| if( ( pxStreamBuffer->ucFlags & sbFLAGS_IS_MESSAGE_BUFFER ) != ( uint8_t ) 0 ) |
There was a problem hiding this comment.
Context: #264 (comment)
laroche
pushed a commit
to laroche/FreeRTOS-Kernel
that referenced
this pull request
Apr 18, 2024
…ed buffers (FreeRTOS#286) * Change type of usGenerateChecksum's ulAlignBits to intptr_t Not all platforms have 32-bit pointers. 8-bit machines such as avr8 have 16-bit pointers. This patch changes the type of ulAlignBits and renames it to uxAlignBits to reflect the type change. This fixes a compiler warning on machines with pointers that aren't 32-bits. Signed-off-by: Andy Bennett <[email protected]> * Fix usGenerateChecksum on odd-aligned buffers with non zero usSum usGenerateChecksum would generate an incorrect checksum when pucNextData was odd-aligned and usSum was non-zero. This was caused by the byte order of usSum not matching the byte order of the subsequent summing operation. Odd-aligned buffers are common on 8-bit platforms such as avr8 when using one of the FreeRTOS dynamic heap allocators. Signed-off-by: Andy Bennett <[email protected]> * Feedback from PR#122 FreeRTOS/FreeRTOS#122 + Use a uintptr_t rather than an intptr_t. Changes supplied by Hein Tibosch. Signed-off-by: Andy Bennett <[email protected]> Co-authored-by: Aniruddha Kanhere <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
PR #264 changed the way prvWriteMessageToBuffer() tested to see if the stream buffer was being used as a message buffer. That update was incorrect and should not have been merged. This change reverts to the original method.
Test Steps
Run the standard stream buffer tests in FreeRTOS/Demo/Common/Minimal/StreamBufferDemo.c.
Related Issue
#264
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.