summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-04-05 20:54:00 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-04-05 20:54:00 +0000
commit16be59858afa332cc8a0f8e61a215e1deea5e897 (patch)
tree0159742e27848cfac6eec8d9d87bd6579af48c18 /nuttx/arch/arm
parent3607bf2b4b1f2087cfb52ab4591f2ac347698a9c (diff)
downloadpx4-nuttx-16be59858afa332cc8a0f8e61a215e1deea5e897.tar.gz
px4-nuttx-16be59858afa332cc8a0f8e61a215e1deea5e897.tar.bz2
px4-nuttx-16be59858afa332cc8a0f8e61a215e1deea5e897.zip
Clean kernel-/user-mode module build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3469 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm')
-rw-r--r--nuttx/arch/arm/src/common/up_createstack.c7
-rwxr-xr-xnuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h2
-rwxr-xr-xnuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c2
3 files changed, 5 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/common/up_createstack.c b/nuttx/arch/arm/src/common/up_createstack.c
index 0c9f0809f..6b8094b5b 100644
--- a/nuttx/arch/arm/src/common/up_createstack.c
+++ b/nuttx/arch/arm/src/common/up_createstack.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/common/up_createstack.c
*
- * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
#include <sys/types.h>
#include <stdint.h>
-#include <stdlib.h>
#include <sched.h>
#include <debug.h>
@@ -97,9 +96,9 @@ int up_create_stack(_TCB *tcb, size_t stack_size)
if (!tcb->stack_alloc_ptr)
{
#ifdef CONFIG_DEBUG
- tcb->stack_alloc_ptr = (uint32_t*)zalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t*)kzalloc(stack_size);
#else
- tcb->stack_alloc_ptr = (uint32_t*)malloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t*)kmalloc(stack_size);
#endif
}
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h b/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h
index 7a08f7445..7601fefca 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h
@@ -197,7 +197,7 @@
* Configuration:
* CONFIG_USBHOST_OHCIRAM_SIZE 1536
* CONFIG_USBHOST_NEDS 2
- * CONFIG_USBHOST_NEDS 3
+ * CONFIG_USBHOST_NTDS 3
* CONFIG_USBHOST_TDBUFFERS 3
* CONFIG_USBHOST_TDBUFSIZE 128
* CONFIG_USBHOST_IOBUFSIZE 512
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c
index 86457bf40..17a14fea8 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c
@@ -2596,7 +2596,7 @@ FAR struct usbhost_driver_s *usbhost_initialize(int controller)
/* Initialize user-configurable request/descriptor transfer buffers */
buffer = (uint8_t *)LPC17_TBFREE_BASE;
- for (i = 0; i < CONFIG_USBHOST_NEDS; i++)
+ for (i = 0; i < CONFIG_USBHOST_TDBUFFERS; i++)
{
/* Put the TD buffer in a free list */