fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 01:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into nuttx-merge-5447

Browse Source
This commit is contained in:
px4dev
2013-01-11 00:39:22 -08:00
parent 40dfbf0d97 0f2decb70f
commit ccf9882dc5
128 changed files with 12693 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/mm/mm_graninit.c
-2
View File
@@ -74,7 +74,6 @@ FAR struct gran_s *g_graninfo;
* Perfrom common GRAN initialization.
*
* Input Parameters:
* info - Private granule data structure pointer
* heapstart - Start of the granule allocation heap
* heapsize - Size of heap in bytes
* log2gran - Log base 2 of the size of one granule. 0->1 byte,
@@ -207,7 +206,6 @@ gran_common_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran,
#ifdef CONFIG_GRAN_SINGLE
int gran_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran,
uint8_t log2align)
int gran_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran)
{
g_graninfo = gran_common_initialize(heapstart, heapsize, log2gran,
log2align);