Release 6.1.9
This commit is contained in:
@@ -80,7 +80,7 @@
|
||||
/* resulting in version 6.1 */
|
||||
/* */
|
||||
/**************************************************************************/
|
||||
UINT _txe_byte_allocate(TX_BYTE_POOL *pool_ptr, VOID **memory_ptr,
|
||||
UINT _txe_byte_allocate(TX_BYTE_POOL *pool_ptr, VOID **memory_ptr,
|
||||
ULONG memory_size, ULONG wait_option)
|
||||
{
|
||||
|
||||
@@ -96,15 +96,15 @@ TX_THREAD *thread_ptr;
|
||||
/* Check for an invalid byte pool pointer. */
|
||||
if (pool_ptr == TX_NULL)
|
||||
{
|
||||
|
||||
|
||||
/* Byte pool pointer is invalid, return appropriate error code. */
|
||||
status = TX_POOL_ERROR;
|
||||
}
|
||||
|
||||
|
||||
/* Now check for invalid pool ID. */
|
||||
else if (pool_ptr -> tx_byte_pool_id != TX_BYTE_POOL_ID)
|
||||
{
|
||||
|
||||
|
||||
/* Byte pool pointer is invalid, return appropriate error code. */
|
||||
status = TX_POOL_ERROR;
|
||||
}
|
||||
@@ -124,7 +124,7 @@ TX_THREAD *thread_ptr;
|
||||
/* Error in size, return appropriate error. */
|
||||
status = TX_SIZE_ERROR;
|
||||
}
|
||||
|
||||
|
||||
/* Determine if the size is greater than the pool size. */
|
||||
else if (memory_size > pool_ptr -> tx_byte_pool_size)
|
||||
{
|
||||
@@ -136,7 +136,7 @@ TX_THREAD *thread_ptr;
|
||||
else
|
||||
{
|
||||
|
||||
/* Check for a wait option error. Only threads are allowed any form of
|
||||
/* Check for a wait option error. Only threads are allowed any form of
|
||||
suspension. */
|
||||
if (wait_option != TX_NO_WAIT)
|
||||
{
|
||||
@@ -144,14 +144,14 @@ TX_THREAD *thread_ptr;
|
||||
/* Is call from ISR or Initialization? */
|
||||
if (TX_THREAD_GET_SYSTEM_STATE() != ((ULONG) 0))
|
||||
{
|
||||
|
||||
|
||||
/* A non-thread is trying to suspend, return appropriate error code. */
|
||||
status = TX_WAIT_ERROR;
|
||||
}
|
||||
}
|
||||
}
|
||||
#ifndef TX_TIMER_PROCESS_IN_ISR
|
||||
|
||||
|
||||
/* Check for timer execution. */
|
||||
if (status == TX_SUCCESS)
|
||||
{
|
||||
@@ -172,15 +172,15 @@ TX_THREAD *thread_ptr;
|
||||
/* Is everything still okay? */
|
||||
if (status == TX_SUCCESS)
|
||||
{
|
||||
|
||||
|
||||
/* Check for interrupt call. */
|
||||
if (TX_THREAD_GET_SYSTEM_STATE() != ((ULONG) 0))
|
||||
{
|
||||
|
||||
|
||||
/* Now, make sure the call is from an interrupt and not initialization. */
|
||||
if (TX_THREAD_GET_SYSTEM_STATE() < TX_INITIALIZE_IN_PROGRESS)
|
||||
{
|
||||
|
||||
|
||||
/* Invalid caller of this function, return appropriate error code. */
|
||||
status = TX_CALLER_ERROR;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user