sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "arch/: Fix an error found in build testing. The protoype of mpu_log2regionfloor() changed; an additional parameter was added. However, none of the calls to mpu_log2regionfloor() were updated to pass the new, additional parameter."

Browse Source 
Commit 8b63d0230936bd7d6bd94f4c76b9402946f69b21 was reverted.  This related commit must now also be reverted to avoid compilation errors.

This reverts commit e8270defc9b26f7a7199288fa9ba203a96ed63d4.
This commit is contained in:
Gregory Nutt 2019-01-08 15:21:29 -06:00
parent d0b4a018bf
commit a7f75b4ee8
12 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/src/kinetis/kinetis_allocateheap.c
View File

@ -123,7 +123,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -137,7 +137,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
kinetis_mpu_uheap(ubase, usize);
kinetis_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -177,7 +177,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/lc823450/lc823450_allocateheap2.c
View File

@ -143,7 +143,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -160,7 +160,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
lc823450_mpu_uheap(ubase, usize);
lc823450_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -208,7 +208,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/lpc17xx/lpc17_allocateheap.c
View File

@ -233,7 +233,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -247,7 +247,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
lpc17_mpu_uheap(ubase, usize);
lpc17_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -287,7 +287,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/lpc43xx/lpc43_allocateheap.c
View File

@ -436,7 +436,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -454,7 +454,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
lpc43_mpu_uheap(ubase, usize);
lpc43_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -503,7 +503,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/sam34/sam_allocateheap.c
View File

@ -222,7 +222,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -236,7 +236,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
sam_mpu_uheap(ubase, usize);
sam_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -276,7 +276,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/samv7/sam_allocateheap.c
View File

@ -229,7 +229,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -243,7 +243,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
sam_mpu_uheap(ubase, usize);
sam_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -283,7 +283,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/stm32/stm32_allocateheap.c
View File

@ -581,7 +581,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -599,7 +599,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
stm32_mpu_uheap(ubase, usize);
stm32_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -643,7 +643,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/stm32f7/stm32_allocateheap.c
View File

@ -292,7 +292,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -310,7 +310,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
stm32_mpu_uheap(ubase, usize);
stm32_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -354,7 +354,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/stm32h7/stm32_allocateheap.c
View File

@ -213,7 +213,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((SRAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -231,7 +231,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
stm32_mpu_uheap(ubase, usize);
stm32_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -275,7 +275,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((SRAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/stm32l4/stm32l4_allocateheap.c
View File

@ -241,7 +241,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -259,7 +259,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
stm32l4_mpu_uheap(ubase, usize);
stm32l4_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -303,7 +303,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/tiva/common/tiva_allocateheap.c
View File

@ -123,7 +123,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -137,7 +137,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
tiva_mpu_uheap(ubase, usize);
tiva_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -177,7 +177,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);

6
arch/arm/src/xmc4/xmc4_allocateheap.c
View File

@ -111,7 +111,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);
@ -125,7 +125,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
xmc4_mpu_uheap(ubase, usize);
xmc4_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@ -165,7 +165,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* is aligned to the MPU requirement.
*/
log2 = (int)mpu_log2regionfloor(ubase, usize);
log2 = (int)mpu_log2regionfloor(usize);
DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
usize = (1 << log2);