RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-05-06 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* rtems/include/rtems/rtems/message.h, sapi/include/confdefs.h,
	score/src/coresemseize.c, score/src/threadhandler.c: Comment
	improvements from class.
This commit is contained in:
Joel Sherrill
2008-05-06 19:38:19 +00:00
parent 4aea8f2b71
commit 76deaf0c64
5 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/ChangeLog
View File

@@ -1,3 +1,9 @@
2008-05-06 Joel Sherrill <joel.sherrill@OARcorp.com>
* rtems/include/rtems/rtems/message.h, sapi/include/confdefs.h,
score/src/coresemseize.c, score/src/threadhandler.c: Comment
improvements from class.
2008-05-06 Joel Sherrill <joel.sherrill@oarcorp.com>
PR 1285/rtems

2
cpukit/rtems/include/rtems/rtems/message.h
View File

@@ -81,7 +81,7 @@ typedef enum {
* each message queue.
*/
typedef struct {
/** This field is the inherited obejct characteristics. */
/** This field is the inherited object characteristics. */
Objects_Control Object;
/** This field is the attribute set as defined by the API. */
rtems_attribute attribute_set;

7
cpukit/sapi/include/confdefs.h
View File

@@ -26,7 +26,7 @@
*/
/*
* COPYRIGHT (c) 1989-2007.
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -1451,8 +1451,9 @@ rtems_configuration_table Configuration = {
* will put an end to it.
*
* NOTE: If you are using the timer driver, it is considered
* mutually exclusive with the clock driver because it
* is assume to use the smae hardware.
* mutually exclusive with the clock driver because the
* drivers are assumed to use the same "timer" hardware
* on many boards.
*/
#if !defined(CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE)
#if !defined(CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER) && \

24
cpukit/score/src/coresemseize.c
View File

@@ -7,7 +7,7 @@
* This core object utilizes standard Dijkstra counting semaphores to provide
* synchronization and mutual exclusion capabilities.
*
* COPYRIGHT (c) 1989-1999.
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -69,16 +69,35 @@ void _CORE_semaphore_Seize(
return;
}
/*
* If the semaphore was not available and the caller was not willing
* to block, then return immediately with a status indicating that
* the semaphore was not available and the caller never blocked.
*/
if ( wait == CORE_SEMAPHORE_NO_WAIT ) {
_ISR_Enable( level );
executing->Wait.return_code = CORE_SEMAPHORE_STATUS_UNSATISFIED_NOWAIT;
return;
}
if (wait == CORE_SEMAPHORE_BAD_TIMEOUT ) {
/*
* This is strange case because normally RTEMS validates parameters
* before performing any real work. But in this case, the POSIX
* API requires that a semaphore be checked for immediate availability
* BEFORE the timeout value is validated. This is implemented in
* RTEMS by indicating a special status that the timeout value
* was invalid which is returned in this case.
*/
if ( wait == CORE_SEMAPHORE_BAD_TIMEOUT ) {
_ISR_Enable( level );
executing->Wait.return_code = CORE_SEMAPHORE_BAD_TIMEOUT_VALUE;
return;
}
/*
* If the semaphore is not available and the caller is willing to
* block, then we now block the caller with optional timeout.
*/
if (( wait == CORE_SEMAPHORE_BLOCK_FOREVER) ||
( wait == CORE_SEMAPHORE_BLOCK_WITH_TIMEOUT ) ) {
_Thread_queue_Enter_critical_section( &the_semaphore->Wait_queue );
@@ -87,5 +106,4 @@ void _CORE_semaphore_Seize(
_ISR_Enable( level );
_Thread_queue_Enqueue( &the_semaphore->Wait_queue, timeout );
}
}

2
cpukit/score/src/threadhandler.c
View File

@@ -2,7 +2,7 @@
* Thread Handler
*
*
* COPYRIGHT (c) 1989-1999.
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be