Fix a typo that crept into lpc17_allocateheap.c in the recent kernel allocator changes

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5729 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2013-03-11 13:21:33 +00:00
parent ec51159d18
commit 229d3c4085
3 changed files with 10 additions and 28 deletions
+1 -1
View File
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/mm.h>
#include <nuttx/kmalloc.h>
#include <arch/board/board.h>
#include "chip.h"
+4 -11
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* common/up_initialize.c
* arch/z16/src/common/up_initialize.c
*
* Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,24 +43,17 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
#include <nuttx/mm.h>
#include <nuttx/ramlog.h>
#include <arch/board/board.h>
#include "up_arch.h"
#include "up_internal.h"
/****************************************************************************
* Definitions
****************************************************************************/
/* Define to enable timing loop calibration. CONFIG_DEBUG and
* CONFIG_ARCH_LOWPUTC must also be enabled in the .config file because
* the logic uses lldbg()
*/
#undef CONFIG_ARCH_CALIBRATION
/****************************************************************************
* Public Data
****************************************************************************/
@@ -94,7 +87,7 @@ volatile FAR chipreg_t *current_regs;
*
****************************************************************************/
#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG) && defined(CONFIG_ARCH_LOWPUTC)
#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
static void up_calibratedelay(void)
{
int i;
@@ -140,7 +133,7 @@ void up_initialize(void)
up_calibratedelay();
/* Add extra memory fragments to the memory manager */
/* Add any extra memory fragments to the memory manager */
#if CONFIG_MM_REGIONS > 1
up_addregion();
+5 -16
View File
@@ -43,32 +43,21 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
#include <nuttx/mm.h>
#include <arch/board/board.h>
#include "chip/switch.h"
#include "up_arch.h"
#include "up_internal.h"
/****************************************************************************
* Definitions
****************************************************************************/
/* Define to enable timing loop calibration */
#undef CONFIG_ARCH_CALIBRATION
/****************************************************************************
* Public Data
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
@@ -83,7 +72,7 @@
*
****************************************************************************/
#if defined(CONFIG_ARCH_CALIBRATION) & defined(CONFIG_DEBUG)
#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
static void up_calibratedelay(void)
{
int i;
@@ -129,7 +118,7 @@ void up_initialize(void)
up_calibratedelay();
/* Add extra memory fragments to the memory manager */
/* Add any extra memory fragments to the memory manager */
#if CONFIG_MM_REGIONS > 1
up_addregion();