Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch: x86_64: fix nxstyle errors

Browse Source 
Fix for errors reported by nxstyle tool

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
This commit is contained in:
Alin Jerpelea
2021-04-07 12:44:30 +02:00
committed by Xiang Xiao
parent ac7feda1bc
commit 72fb895d41
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86_64/include/multiboot2.h
+14 -13
View File
@@ -1,24 +1,25 @@
/**************************************************************************** /****************************************************************************
* arch/x86_64/include/multiboot2.h * arch/x86_64/include/multiboot2.h
* *
* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. * Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a
* of this software and associated documentation files (the "Software"), to * copy of this software and associated documentation files (the "Software"),
* deal in the Software without restriction, including without limitation the * to deal in the Software without restriction, including without limitation
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or * the rights to use, copy, modify, merge, publish, distribute, sublicense,
* sell copies of the Software, and to permit persons to whom the Software is * and/or sell copies of the Software, and to permit persons to whom the
* furnished to do so, subject to the following conditions: * Software is furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included
* all copies or substantial portions of the Software. * in all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, * ANY DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
* *
****************************************************************************/ ****************************************************************************/
arch/x86_64/src/common/up_allocateheap.c
+6 -4
View File
@@ -69,10 +69,12 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
{ {
board_autoled_on(LED_HEAPALLOCATE); board_autoled_on(LED_HEAPALLOCATE);
// Calculate the end of .bss section /* Calculate the end of .bss section */
uintptr_t hstart = (((uintptr_t)&_ebss + PAGE_SIZE - 1) & PAGE_MASK);
*heap_start = (void*)hstart; uintptr_t hstart = (((uintptr_t)&_ebss + PAGE_SIZE - 1) & PAGE_MASK);
*heap_start = (void *)hstart;
/* The size is the rest of the RAM */
// The size is the rest of the RAM
*heap_size = (size_t)(CONFIG_RAM_SIZE - (hstart - 0x100000000 - 1)); *heap_size = (size_t)(CONFIG_RAM_SIZE - (hstart - 0x100000000 - 1));
} }