diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-11 20:33:58 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-11 20:33:58 +0000 |
| commit | 63240531781806cb440108ebd5ad0c3dc62510d3 (patch) | |
| tree | 386d184c161ad982f82fe673bdf69319f84cca6b /nuttx/mm/mm_graninit.c | |
| parent | 205242a575697630d073edc02a6341e6d9be22a6 (diff) | |
| download | px4-nuttx-63240531781806cb440108ebd5ad0c3dc62510d3.tar.gz px4-nuttx-63240531781806cb440108ebd5ad0c3dc62510d3.tar.bz2 px4-nuttx-63240531781806cb440108ebd5ad0c3dc62510d3.zip | |
Update to granule allocator; Update to ENC28j60 driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5130 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/mm/mm_graninit.c')
| -rw-r--r-- | nuttx/mm/mm_graninit.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/nuttx/mm/mm_graninit.c b/nuttx/mm/mm_graninit.c index 99b499155..46b5f5ff1 100644 --- a/nuttx/mm/mm_graninit.c +++ b/nuttx/mm/mm_graninit.c @@ -39,8 +39,14 @@ #include <nuttx/config.h> +#include <stdlib.h> + #include <nuttx/gran.h> +#include "mm_gran.h" + +#ifdef CONFIG_GRAN + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -108,7 +114,7 @@ static inline FAR struct gran_s *gran_common_initialize(FAR void *heapstart, priv->log2gran = log2gran; priv->ngranules = ngranules; - priv->heapstart = alignedstart + priv->heapstart = alignedstart; } return priv; @@ -161,3 +167,6 @@ GRAN_HANDLE gran_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gr } #endif +#endif /* CONFIG_GRAN */ + + |