Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename kumalloc to kumm_malloc and kuzalloc to kumm_zalloc for consistency with other naming

Browse Source
This commit is contained in:
Gregory Nutt
2014-08-31 16:24:24 -06:00
parent 1643c35609
commit bcb5a5316e
16 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/common/up_createstack.c
+2 -2
View File
@@ -174,9 +174,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
arch/arm/src/lpc31xx/lpc31_ehci.c
+2 -2
View File
@@ -3773,7 +3773,7 @@ static int lpc31_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
* Some hardware supports special memory in which larger IO buffers can
* be accessed more efficiently. This method provides a mechanism to allocate
* the request/descriptor memory. If the underlying hardware does not support
* such "special" memory, this functions may simply map to kumalloc.
* such "special" memory, this functions may simply map to kumm_malloc.
*
* This interface differs from DRVR_ALLOC in that the buffers are variable-sized.
*
@@ -3802,7 +3802,7 @@ static int lpc31_ioalloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer
* accessible (depending on how the class driver implements its buffering).
*/
*buffer = (FAR uint8_t *)kumalloc(buflen);
*buffer = (FAR uint8_t *)kumm_malloc(buflen);
return *buffer ? OK : -ENOMEM;
}
arch/arm/src/sam34/sam_udp.c
+1 -1
View File
@@ -3035,7 +3035,7 @@ static void *sam_ep_allocbuffer(struct usbdev_ep_s *ep, uint16_t nbytes)
{
/* There is not special buffer allocation requirement */
return kumalloc(nbytes);
return kumm_malloc(nbytes);
}
#endif
arch/arm/src/sama5/sam_ehci.c
+2 -2
View File
@@ -3613,7 +3613,7 @@ static int sam_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
* Some hardware supports special memory in which larger IO buffers can
* be accessed more efficiently. This method provides a mechanism to allocate
* the request/descriptor memory. If the underlying hardware does not support
* such "special" memory, this functions may simply map to kumalloc.
* such "special" memory, this functions may simply map to kumm_malloc.
*
* This interface differs from DRVR_ALLOC in that the buffers are variable-sized.
*
@@ -3642,7 +3642,7 @@ static int sam_ioalloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer,
* accessible (depending on how the class driver implements its buffering).
*/
*buffer = (FAR uint8_t *)kumalloc(buflen);
*buffer = (FAR uint8_t *)kumm_malloc(buflen);
return *buffer ? OK : -ENOMEM;
}
arch/arm/src/sama5/sam_ohci.c
+3 -3
View File
@@ -2677,7 +2677,7 @@ static int sam_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
* Some hardware supports special memory in which larger IO buffers can
* be accessed more efficiently. This method provides a mechanism to allocate
* the request/descriptor memory. If the underlying hardware does not support
* such "special" memory, this functions may simply map to kumalloc.
* such "special" memory, this functions may simply map to kumm_malloc.
*
* This interface differs from DRVR_ALLOC in that the buffers are variable-sized.
*
@@ -2702,9 +2702,9 @@ static int sam_ioalloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer,
{
DEBUGASSERT(drvr && buffer);
/* kumalloc() should return user accessible, DMA-able memory */
/* kumm_malloc() should return user accessible, DMA-able memory */
*buffer = kumalloc(buflen);
*buffer = kumm_malloc(buflen);
return *buffer ? OK : -ENOMEM;
}
arch/arm/src/sama5/sam_udphs.c
+1 -1
View File
@@ -3524,7 +3524,7 @@ static void *sam_ep_allocbuffer(struct usbdev_ep_s *ep, uint16_t nbytes)
{
/* There is not special buffer allocation requirement */
return kumalloc(nbytes);
return kumm_malloc(nbytes);
}
#endif
arch/avr/src/avr/up_createstack.c
+2 -2
View File
@@ -121,9 +121,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
*/
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
#ifdef CONFIG_DEBUG
arch/avr/src/avr32/up_createstack.c
+2 -2
View File
@@ -141,9 +141,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
arch/hc/src/common/up_createstack.c
+2 -2
View File
@@ -138,9 +138,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
arch/mips/src/common/up_createstack.c
+2 -2
View File
@@ -159,9 +159,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
arch/rgmp/src/nuttx.c
+1 -1
View File
@@ -134,7 +134,7 @@ int up_create_stack(struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
} else
#endif
{
stack_alloc_ptr = (uint32_t*)kumalloc(adj_stack_size);
stack_alloc_ptr = (uint32_t*)kumm_malloc(adj_stack_size);
}
if (stack_alloc_ptr) {
/* This is the address of the last word in the allocation */
arch/sh/src/common/up_createstack.c
+2 -2
View File
@@ -138,9 +138,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
arch/sim/src/up_createstack.c
+1 -1
View File
@@ -107,7 +107,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Allocate the memory for the stack */
stack_alloc_ptr = (uint32_t*)kumalloc(adj_stack_size);
stack_alloc_ptr = (uint32_t*)kumm_malloc(adj_stack_size);
/* Was the allocation successful? */
arch/x86/src/i486/up_createstack.c
+2 -2
View File
@@ -140,9 +140,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
arch/z16/src/common/up_createstack.c
+2 -2
View File
@@ -118,9 +118,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
*/
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
#ifdef CONFIG_DEBUG
arch/z80/src/common/up_createstack.c
+2 -2
View File
@@ -138,9 +138,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}