Skip to content

Commit

Permalink
[kernel & MemMang] use space to replace tab and remove meaningless sp…
Browse files Browse the repository at this point in the history 
…ace in the end of each line (#314)

Signed-off-by: Meco Man <920369182@qq.com>

Co-authored-by: alfred gedeon <28123637+alfred2g@users.noreply.github.com>
  • Loading branch information
@mysterywolf @alfred2g
mysterywolf and alfred2g authored Apr 19, 2021
1 parent 46f7feb commit d877074
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion include/croutine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ typedef struct corCoRoutineControlBlock
* crCOROUTINE_CODE pxCoRoutineCode,
* UBaseType_t uxPriority,
* UBaseType_t uxIndex
* );
* );
* </pre>
*
* Create a new co-routine and add it to the list of co-routines that are
Expand Down
6 changes: 3 additions & 3 deletions include/timers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1329,10 +1329,10 @@ BaseType_t xTimerGenericCommand( TimerHandle_t xTimer,
/**
* task.h
* <pre>void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer, StackType_t ** ppxTimerTaskStackBuffer, uint32_t *pulTimerTaskStackSize ) </pre>
*
* This function is used to provide a statically allocated block of memory to FreeRTOS to hold the Timer Task TCB. This function is required when
*
* This function is used to provide a statically allocated block of memory to FreeRTOS to hold the Timer Task TCB. This function is required when
* configSUPPORT_STATIC_ALLOCATION is set. For more information see this URI: https://www.FreeRTOS.org/a00110.html#configSUPPORT_STATIC_ALLOCATION
*
*
* @param ppxTimerTaskTCBBuffer A handle to a statically allocated TCB buffer
* @param ppxTimerTaskStackBuffer A handle to a statically allocated Stack buffer for thie idle task
* @param pulTimerTaskStackSize A pointer to the number of elements that will fit in the allocated stack buffer
Expand Down
4 changes: 2 additions & 2 deletions portable/MemMang/heap_1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ void * pvPortMalloc( size_t xWantedSize )
if ( (xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) )) > xWantedSize )
{
xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );
}
else
}
else
{
xWantedSize = 0;
}
Expand Down
10 changes: 5 additions & 5 deletions portable/MemMang/heap_2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ void * pvPortMalloc( size_t xWantedSize )

/* The wanted size must be increased so it can contain a BlockLink_t
* structure in addition to the requested amount of bytes. */
if( ( xWantedSize > 0 ) &&
if( ( xWantedSize > 0 ) &&
( ( xWantedSize + heapSTRUCT_SIZE ) > xWantedSize ) ) /* Overflow check */
{
xWantedSize += heapSTRUCT_SIZE;

/* Byte alignment required. Check for overflow. */
if( ( xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) ) )
if( ( xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) ) )
> xWantedSize )
{
xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );
Expand All @@ -148,11 +148,11 @@ void * pvPortMalloc( size_t xWantedSize )
else
{
xWantedSize = 0;
}
}
}
else
else
{
xWantedSize = 0;
xWantedSize = 0;
}


Expand Down
12 changes: 6 additions & 6 deletions portable/MemMang/heap_4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ void * pvPortMalloc( size_t xWantedSize )
{
/* The wanted size must be increased so it can contain a BlockLink_t
* structure in addition to the requested amount of bytes. */
if( ( xWantedSize > 0 ) &&
if( ( xWantedSize > 0 ) &&
( ( xWantedSize + xHeapStructSize ) > xWantedSize ) ) /* Overflow check */
{
xWantedSize += xHeapStructSize;
Expand All @@ -147,7 +147,7 @@ void * pvPortMalloc( size_t xWantedSize )
if( ( xWantedSize & portBYTE_ALIGNMENT_MASK ) != 0x00 )
{
/* Byte alignment required. Check for overflow. */
if( ( xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) ) )
if( ( xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) ) )
> xWantedSize )
{
xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );
Expand All @@ -156,21 +156,21 @@ void * pvPortMalloc( size_t xWantedSize )
else
{
xWantedSize = 0;
}
}
}
else
{
mtCOVERAGE_TEST_MARKER();
}
}
else
}
else
{
xWantedSize = 0;
}

if( ( xWantedSize > 0 ) && ( xWantedSize <= xFreeBytesRemaining ) )
{
/* Traverse the list from the start (lowest address) block until
/* Traverse the list from the start (lowest address) block until
* one of adequate size is found. */
pxPreviousBlock = &xStart;
pxBlock = xStart.pxNextFreeBlock;
Expand Down
12 changes: 6 additions & 6 deletions portable/MemMang/heap_5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
*
* typedef struct HeapRegion
* {
* uint8_t *pucStartAddress; << Start address of a block of memory that will be part of the heap.
* size_t xSizeInBytes; << Size of the block of memory.
* uint8_t *pucStartAddress; << Start address of a block of memory that will be part of the heap.
* size_t xSizeInBytes; << Size of the block of memory.
* } HeapRegion_t;
*
* The array is terminated using a NULL zero sized region definition, and the
Expand Down Expand Up @@ -149,7 +149,7 @@ void * pvPortMalloc( size_t xWantedSize )
{
/* The wanted size is increased so it can contain a BlockLink_t
* structure in addition to the requested amount of bytes. */
if( ( xWantedSize > 0 ) &&
if( ( xWantedSize > 0 ) &&
( ( xWantedSize + xHeapStructSize ) > xWantedSize ) ) /* Overflow check */
{
xWantedSize += xHeapStructSize;
Expand All @@ -162,8 +162,8 @@ void * pvPortMalloc( size_t xWantedSize )
xWantedSize )
{
xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );
}
else
}
else
{
xWantedSize = 0;
}
Expand All @@ -180,7 +180,7 @@ void * pvPortMalloc( size_t xWantedSize )

if( ( xWantedSize > 0 ) && ( xWantedSize <= xFreeBytesRemaining ) )
{
/* Traverse the list from the start (lowest address) block until
/* Traverse the list from the start (lowest address) block until
* one of adequate size is found. */
pxPreviousBlock = &xStart;
pxBlock = xStart.pxNextFreeBlock;
Expand Down
2 changes: 1 addition & 1 deletion timers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@
{
/* Advance the expiry time. */
xExpiredTime += pxTimer->xTimerPeriodInTicks;

/* Call the timer callback. */
traceTIMER_EXPIRED( pxTimer );
pxTimer->pxCallbackFunction( ( TimerHandle_t ) pxTimer );
Expand Down

0 comments on commit d877074

Please sign in to comment.