From 3316c196d46887f1b931bedce8d57f3b3501e2ae Mon Sep 17 00:00:00 2001 From: Nathan Hartman <59230071+hartmannathan@users.noreply.github.com> Date: Thu, 10 Sep 2020 10:11:21 -0400 Subject: [PATCH] tiva: tiva_adclow.c, tiva_allocateheap: Fix nxstyle warnings arch/arm/src/tiva/common/tiva_adclow.c: * Fix nxstyle warnings. No functional changes. arch/arm/src/tiva/common/tiva_allocateheap.c * Fix nxstyle warnings. No functional changes. --- arch/arm/src/tiva/common/tiva_adclow.c | 4 +++- arch/arm/src/tiva/common/tiva_allocateheap.c | 11 +++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/src/tiva/common/tiva_adclow.c b/arch/arm/src/tiva/common/tiva_adclow.c index 8ec1d0a545..1d563d7d46 100644 --- a/arch/arm/src/tiva/common/tiva_adclow.c +++ b/arch/arm/src/tiva/common/tiva_adclow.c @@ -589,7 +589,9 @@ static int tiva_adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg) fifo_count = tiva_adc_sse_data(priv->devno, sse, buf); - /* Verify that the upper-half driver has bound its callback functions */ + /* Verify that the upper-half driver has bound its callback + * functions + */ if (priv->cb != NULL) { diff --git a/arch/arm/src/tiva/common/tiva_allocateheap.c b/arch/arm/src/tiva/common/tiva_allocateheap.c index a74d87efb2..e635a1657d 100644 --- a/arch/arm/src/tiva/common/tiva_allocateheap.c +++ b/arch/arm/src/tiva/common/tiva_allocateheap.c @@ -95,7 +95,8 @@ * * Kernel .data region. Size determined at link time. * Kernel .bss region Size determined at link time. - * Kernel IDLE thread stack. Size determined by CONFIG_IDLETHREAD_STACKSIZE. + * Kernel IDLE thread stack. Size determined by + * CONFIG_IDLETHREAD_STACKSIZE. * Padding for alignment * User .data region. Size determined at link time. * User .bss region Size determined at link time. @@ -112,7 +113,8 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) * of CONFIG_MM_KERNEL_HEAPSIZE (subject to alignment). */ - uintptr_t ubase = (uintptr_t)USERSPACE->us_bssend + CONFIG_MM_KERNEL_HEAPSIZE; + uintptr_t ubase = (uintptr_t)USERSPACE->us_bssend + + CONFIG_MM_KERNEL_HEAPSIZE; size_t usize = CONFIG_RAM_END - ubase; int log2; @@ -137,7 +139,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((uintptr_t)ubase, usize); + tiva_mpu_uheap((uintptr_t)ubase, usize); #else /* Return the heap settings */ @@ -166,7 +168,8 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) * of CONFIG_MM_KERNEL_HEAPSIZE (subject to alignment). */ - uintptr_t ubase = (uintptr_t)USERSPACE->us_bssend + CONFIG_MM_KERNEL_HEAPSIZE; + uintptr_t ubase = (uintptr_t)USERSPACE->us_bssend + + CONFIG_MM_KERNEL_HEAPSIZE; size_t usize = CONFIG_RAM_END - ubase; int log2;