File tree Expand file tree Collapse file tree 3 files changed +15
-15
lines changed Expand file tree Collapse file tree 3 files changed +15
-15
lines changed Original file line number Diff line number Diff line change 56
56
57
57
/* The application writer has already defined the array used for the RTOS
58
58
* heap - probably so it can be placed in a special segment or address. */
59
- extern uint8_t ucHeap [ configTOTAL_HEAP_SIZE ];
59
+ extern uint8_t ucHeap [ ];
60
60
#else
61
61
static uint8_t ucHeap [ configTOTAL_HEAP_SIZE ];
62
62
#endif /* configAPPLICATION_ALLOCATED_HEAP */
@@ -80,8 +80,8 @@ void * pvPortMalloc( size_t xWantedSize )
80
80
if ( (xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) )) > xWantedSize )
81
81
{
82
82
xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );
83
- }
84
- else
83
+ }
84
+ else
85
85
{
86
86
xWantedSize = 0 ;
87
87
}
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ static void prvHeapInit( void );
62
62
63
63
/* The application writer has already defined the array used for the RTOS
64
64
* heap - probably so it can be placed in a special segment or address. */
65
- extern uint8_t ucHeap [ configTOTAL_HEAP_SIZE ];
65
+ extern uint8_t ucHeap [ ];
66
66
#else
67
67
static uint8_t ucHeap [ configTOTAL_HEAP_SIZE ];
68
68
#endif /* configAPPLICATION_ALLOCATED_HEAP */
@@ -133,13 +133,13 @@ void * pvPortMalloc( size_t xWantedSize )
133
133
134
134
/* The wanted size must be increased so it can contain a BlockLink_t
135
135
* structure in addition to the requested amount of bytes. */
136
- if ( ( xWantedSize > 0 ) &&
136
+ if ( ( xWantedSize > 0 ) &&
137
137
( ( xWantedSize + heapSTRUCT_SIZE ) > xWantedSize ) ) /* Overflow check */
138
138
{
139
139
xWantedSize += heapSTRUCT_SIZE ;
140
140
141
141
/* Byte alignment required. Check for overflow. */
142
- if ( ( xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) ) )
142
+ if ( ( xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) ) )
143
143
> xWantedSize )
144
144
{
145
145
xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );
@@ -148,11 +148,11 @@ void * pvPortMalloc( size_t xWantedSize )
148
148
else
149
149
{
150
150
xWantedSize = 0 ;
151
- }
151
+ }
152
152
}
153
- else
153
+ else
154
154
{
155
- xWantedSize = 0 ;
155
+ xWantedSize = 0 ;
156
156
}
157
157
158
158
Original file line number Diff line number Diff line change 59
59
60
60
/* The application writer has already defined the array used for the RTOS
61
61
* heap - probably so it can be placed in a special segment or address. */
62
- extern uint8_t ucHeap [ configTOTAL_HEAP_SIZE ];
62
+ extern uint8_t ucHeap [ ];
63
63
#else
64
64
PRIVILEGED_DATA static uint8_t ucHeap [ configTOTAL_HEAP_SIZE ];
65
65
#endif /* configAPPLICATION_ALLOCATED_HEAP */
@@ -138,7 +138,7 @@ void * pvPortMalloc( size_t xWantedSize )
138
138
{
139
139
/* The wanted size must be increased so it can contain a BlockLink_t
140
140
* structure in addition to the requested amount of bytes. */
141
- if ( ( xWantedSize > 0 ) &&
141
+ if ( ( xWantedSize > 0 ) &&
142
142
( ( xWantedSize + xHeapStructSize ) > xWantedSize ) ) /* Overflow check */
143
143
{
144
144
xWantedSize += xHeapStructSize ;
@@ -147,7 +147,7 @@ void * pvPortMalloc( size_t xWantedSize )
147
147
if ( ( xWantedSize & portBYTE_ALIGNMENT_MASK ) != 0x00 )
148
148
{
149
149
/* Byte alignment required. Check for overflow. */
150
- if ( ( xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) ) )
150
+ if ( ( xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) ) )
151
151
> xWantedSize )
152
152
{
153
153
xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );
@@ -156,14 +156,14 @@ void * pvPortMalloc( size_t xWantedSize )
156
156
else
157
157
{
158
158
xWantedSize = 0 ;
159
- }
159
+ }
160
160
}
161
161
else
162
162
{
163
163
mtCOVERAGE_TEST_MARKER ();
164
164
}
165
- }
166
- else
165
+ }
166
+ else
167
167
{
168
168
xWantedSize = 0 ;
169
169
}
You can’t perform that action at this time.
0 commit comments