Skip to content

Commit

Permalink
Merge branch 'main' into pcTaskGetName_MPU_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@aggarg
aggarg authored Aug 3, 2023
2 parents 25a2cd5 + a5bf4d9 commit 89845af
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 14 deletions.
3 changes: 2 additions & 1 deletion portable/ARMv8M/secure/heap/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/GCC/ARM_CM23/secure/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/GCC/ARM_CM33/secure/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/GCC/ARM_CM35P/secure/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/GCC/ARM_CM55/secure/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/GCC/ARM_CM85/secure/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/IAR/ARM_CM23/secure/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/IAR/ARM_CM33/secure/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/IAR/ARM_CM35P/secure/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/IAR/ARM_CM55/secure/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/IAR/ARM_CM85/secure/secure_heap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/MemMang/heap_2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( ( pxNewBlockLink ) );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}

xFreeBytesRemaining -= pxBlock->xBlockSize;
Expand Down
3 changes: 2 additions & 1 deletion portable/MemMang/heap_4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( pxNewBlockLink );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion portable/MemMang/heap_5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@ void * pvPortMalloc( size_t xWantedSize )
pxBlock->xBlockSize = xWantedSize;

/* Insert the new block into the list of free blocks. */
prvInsertBlockIntoFreeList( ( pxNewBlockLink ) );
pxNewBlockLink->pxNextFreeBlock = pxPreviousBlock->pxNextFreeBlock;
pxPreviousBlock->pxNextFreeBlock = pxNewBlockLink;
}
else
{
Expand Down

0 comments on commit 89845af

Please sign in to comment.