From 04dba496a650cbd1c4ee04a12d6afa38210bcc02 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 19 Oct 2006 19:20:10 +0000 Subject: 2006-10-19 Joel Sherrill * configure.ac, itron/Makefile.am, itron/preinstall.am, posix/Makefile.am, posix/preinstall.am, rtems/Makefile.am, rtems/preinstall.am, sapi/Makefile.am, sapi/preinstall.am, score/Makefile.am, score/preinstall.am, score/include/rtems/system.h, score/include/rtems/score/chain.h, score/include/rtems/score/thread.h, score/src/chain.c, score/src/coremutexseize.c, score/src/threadget.c: Remove all macro implementations and use only the static inline. Static inline functions are now well supported so there is no reason for duplicate maintenance. * itron/macros/rtems/itron/eventflags.inl, itron/macros/rtems/itron/fmempool.inl, itron/macros/rtems/itron/intr.inl, itron/macros/rtems/itron/mbox.inl, itron/macros/rtems/itron/msgbuffer.inl, itron/macros/rtems/itron/network.inl, itron/macros/rtems/itron/port.inl, itron/macros/rtems/itron/semaphore.inl, itron/macros/rtems/itron/sysmgmt.inl, itron/macros/rtems/itron/task.inl, itron/macros/rtems/itron/time.inl, itron/macros/rtems/itron/vmempool.inl, posix/macros/rtems/posix/cond.inl, posix/macros/rtems/posix/key.inl, posix/macros/rtems/posix/mqueue.inl, posix/macros/rtems/posix/mutex.inl, posix/macros/rtems/posix/priority.inl, posix/macros/rtems/posix/pthread.inl, posix/macros/rtems/posix/semaphore.inl, posix/macros/rtems/posix/timer.inl, rtems/macros/rtems/rtems/asr.inl, rtems/macros/rtems/rtems/attr.inl, rtems/macros/rtems/rtems/barrier.inl, rtems/macros/rtems/rtems/dpmem.inl, rtems/macros/rtems/rtems/event.inl, rtems/macros/rtems/rtems/eventset.inl, rtems/macros/rtems/rtems/message.inl, rtems/macros/rtems/rtems/modes.inl, rtems/macros/rtems/rtems/options.inl, rtems/macros/rtems/rtems/part.inl, rtems/macros/rtems/rtems/ratemon.inl, rtems/macros/rtems/rtems/region.inl, rtems/macros/rtems/rtems/sem.inl, rtems/macros/rtems/rtems/status.inl, rtems/macros/rtems/rtems/support.inl, rtems/macros/rtems/rtems/tasks.inl, rtems/macros/rtems/rtems/timer.inl, sapi/macros/rtems/extension.inl, score/macros/README, score/macros/rtems/score/address.inl, score/macros/rtems/score/chain.inl, score/macros/rtems/score/corebarrier.inl, score/macros/rtems/score/coremsg.inl, score/macros/rtems/score/coremutex.inl, score/macros/rtems/score/corerwlock.inl, score/macros/rtems/score/coresem.inl, score/macros/rtems/score/corespinlock.inl, score/macros/rtems/score/heap.inl, score/macros/rtems/score/isr.inl, score/macros/rtems/score/mppkt.inl, score/macros/rtems/score/object.inl, score/macros/rtems/score/objectmp.inl, score/macros/rtems/score/priority.inl, score/macros/rtems/score/stack.inl, score/macros/rtems/score/states.inl, score/macros/rtems/score/sysstate.inl, score/macros/rtems/score/thread.inl, score/macros/rtems/score/threadmp.inl, score/macros/rtems/score/tod.inl, score/macros/rtems/score/tqdata.inl, score/macros/rtems/score/userext.inl, score/macros/rtems/score/watchdog.inl, score/macros/rtems/score/wkspace.inl: Removed. --- cpukit/itron/Makefile.am | 10 --- cpukit/itron/macros/rtems/itron/eventflags.inl | 80 ------------------- cpukit/itron/macros/rtems/itron/fmempool.inl | 82 ------------------- cpukit/itron/macros/rtems/itron/intr.inl | 34 -------- cpukit/itron/macros/rtems/itron/mbox.inl | 79 ------------------ cpukit/itron/macros/rtems/itron/msgbuffer.inl | 82 ------------------- cpukit/itron/macros/rtems/itron/network.inl | 34 -------- cpukit/itron/macros/rtems/itron/port.inl | 79 ------------------ cpukit/itron/macros/rtems/itron/semaphore.inl | 106 ------------------------- cpukit/itron/macros/rtems/itron/sysmgmt.inl | 34 -------- cpukit/itron/macros/rtems/itron/task.inl | 106 ------------------------- cpukit/itron/macros/rtems/itron/time.inl | 34 -------- cpukit/itron/macros/rtems/itron/vmempool.inl | 85 -------------------- cpukit/itron/preinstall.am | 51 ------------ 14 files changed, 896 deletions(-) delete mode 100644 cpukit/itron/macros/rtems/itron/eventflags.inl delete mode 100644 cpukit/itron/macros/rtems/itron/fmempool.inl delete mode 100644 cpukit/itron/macros/rtems/itron/intr.inl delete mode 100644 cpukit/itron/macros/rtems/itron/mbox.inl delete mode 100644 cpukit/itron/macros/rtems/itron/msgbuffer.inl delete mode 100644 cpukit/itron/macros/rtems/itron/network.inl delete mode 100644 cpukit/itron/macros/rtems/itron/port.inl delete mode 100644 cpukit/itron/macros/rtems/itron/semaphore.inl delete mode 100644 cpukit/itron/macros/rtems/itron/sysmgmt.inl delete mode 100644 cpukit/itron/macros/rtems/itron/task.inl delete mode 100644 cpukit/itron/macros/rtems/itron/time.inl delete mode 100644 cpukit/itron/macros/rtems/itron/vmempool.inl (limited to 'cpukit/itron') diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am index 81ecdedd88..3dcffa42a5 100644 --- a/cpukit/itron/Makefile.am +++ b/cpukit/itron/Makefile.am @@ -44,7 +44,6 @@ EXTRA_DIST += include/rtems/itron/README ## Inline -if INLINE include_rtems_itron_HEADERS += inline/rtems/itron/eventflags.inl \ inline/rtems/itron/fmempool.inl inline/rtems/itron/intr.inl \ inline/rtems/itron/mbox.inl inline/rtems/itron/msgbuffer.inl \ @@ -52,15 +51,6 @@ include_rtems_itron_HEADERS += inline/rtems/itron/eventflags.inl \ inline/rtems/itron/semaphore.inl inline/rtems/itron/sysmgmt.inl \ inline/rtems/itron/task.inl inline/rtems/itron/time.inl \ inline/rtems/itron/vmempool.inl -else -include_rtems_itron_HEADERS += macros/rtems/itron/eventflags.inl \ - macros/rtems/itron/fmempool.inl macros/rtems/itron/intr.inl \ - macros/rtems/itron/mbox.inl macros/rtems/itron/msgbuffer.inl \ - macros/rtems/itron/network.inl macros/rtems/itron/port.inl \ - macros/rtems/itron/semaphore.inl macros/rtems/itron/sysmgmt.inl \ - macros/rtems/itron/task.inl macros/rtems/itron/time.inl \ - macros/rtems/itron/vmempool.inl -endif ## Sources diff --git a/cpukit/itron/macros/rtems/itron/eventflags.inl b/cpukit/itron/macros/rtems/itron/eventflags.inl deleted file mode 100644 index b83d419f33..0000000000 --- a/cpukit/itron/macros/rtems/itron/eventflags.inl +++ /dev/null @@ -1,80 +0,0 @@ -/** - * @file rtems/itron/eventflags.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_EVENTFLAGS_INL -#define _RTEMS_ITRON_EVENTFLAGS_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * _ITRON_Eventflags_Allocate - */ - -#define _ITRON_Eventflags_Allocate( _flgid ) \ - (ITRON_Eventflags_Control *)_ITRON_Objects_Allocate_by_index( \ - &_ITRON_Eventflags_Information, \ - (_flgid), \ - sizeof(ITRON_Eventflags_Control) \ - ) - -/* - * _ITRON_Eventflags_Clarify_allocation_id_error - */ - -#define _ITRON_Eventflags_Clarify_allocation_id_error( _id ) \ - _ITRON_Objects_Clarify_allocation_id_error( \ - &_ITRON_Eventflags_Information, (_id) ) - -/* - * _ITRON_Eventflags_Clarify_get_id_error - */ - -#define _ITRON_Eventflags_Clarify_get_id_error( _id ) \ - _ITRON_Objects_Clarify_get_id_error( &_ITRON_Eventflags_Information, (_id) ) - -/* - * _ITRON_Eventflags_Free - */ - -#define _ITRON_Eventflags_Free( _the_eventflags ) \ - _ITRON_Objects_Free( &_ITRON_Eventflags_Information, \ - &(_the_eventflags)->Object ) - - -/* - * _ITRON_Eventflags_Get - */ - -#define _ITRON_Eventflags_Get( _id, _location ) \ - (ITRON_Eventflags_Control *) \ - _ITRON_Objects_Get( &_ITRON_Eventflags_Information, (_id), (_location) ) - -/*PAGE - * - * _ITRON_Eventflags_Is_null - */ - -#define _ITRON_Eventflags_Is_null( _the_eventflags ) \ - ( (_the_eventflags) == NULL ); - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/macros/rtems/itron/fmempool.inl b/cpukit/itron/macros/rtems/itron/fmempool.inl deleted file mode 100644 index 4a9fa252b7..0000000000 --- a/cpukit/itron/macros/rtems/itron/fmempool.inl +++ /dev/null @@ -1,82 +0,0 @@ -/** - * @file rtems/itron/fmempool.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_FMEMPOOL_INL -#define _RTEMS_ITRON_FMEMPOOL_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * _ITRON_Fixed_memory_pool_Allocate - */ - -#define _ITRON_Fixed_memory_pool_Allocate( _mpfid ) \ - (ITRON_Fixed_memory_pool_Control *)_ITRON_Objects_Allocate_by_index( \ - &_ITRON_Fixed_memory_pool_Information, \ - (_mpfid), \ - sizeof(ITRON_Fixed_memory_pool_Control) \ - ) - -/* - * _ITRON_Fixed_memory_pool_Clarify_allocation_id_error - */ - -#define _ITRON_Fixed_memory_pool_Clarify_allocation_id_error( _id ) \ - _ITRON_Objects_Clarify_allocation_id_error( \ - &_ITRON_Fixed_memory_pool_Information, (_id) ) - -/* - * _ITRON_Fixed_memory_pool_Clarify_get_id_error - */ - -#define _ITRON_Fixed_memory_pool_Clarify_get_id_error( _id ) \ - _ITRON_Objects_Clarify_get_id_error( \ - &_ITRON_Fixed_memory_pool_Information, (_id) ) - -/* - * _ITRON_Fixed_memory_pool_Free - */ - -#define _ITRON_Fixed_memory_pool_Free( _the_fixed_memory_pool ) \ - _ITRON_Objects_Free( \ - &_ITRON_Fixed_memory_pool_Information, \ - &(_the_fixed_memory_pool)->Object \ - ) - -/* - * _ITRON_Fixed_memory_pool_Get - */ - -#define _ITRON_Fixed_memory_pool_Get( _id, _location ) \ - (ITRON_Fixed_memory_pool_Control *) \ - _ITRON_Objects_Get( &_ITRON_Fixed_memory_pool_Information, \ - (_id), (_location) ) - -/* - * _ITRON_Fixed_memory_pool_Is_null - */ - -#define _ITRON_Fixed_memory_pool_Is_null( _the_fixed_memory_pool ) \ - ( (_the_fixed_memory_pool) == NULL ) - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/macros/rtems/itron/intr.inl b/cpukit/itron/macros/rtems/itron/intr.inl deleted file mode 100644 index 39063c3309..0000000000 --- a/cpukit/itron/macros/rtems/itron/intr.inl +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file rtems/itron/intr.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_INTR_INL -#define _RTEMS_ITRON_INTR_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * XXX insert inline routines here - */ - - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/macros/rtems/itron/mbox.inl b/cpukit/itron/macros/rtems/itron/mbox.inl deleted file mode 100644 index c4e87203ad..0000000000 --- a/cpukit/itron/macros/rtems/itron/mbox.inl +++ /dev/null @@ -1,79 +0,0 @@ -/** - * @file rtems/itron/mbox.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_MBOX_INL -#define _RTEMS_ITRON_MBOX_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * _ITRON_Mailbox_Allocate - */ - -#define _ITRON_Mailbox_Allocate( _mbxid ) \ - (ITRON_Mailbox_Control *)_ITRON_Objects_Allocate_by_index( \ - &_ITRON_Mailbox_Information, \ - (_mbxid), \ - sizeof(ITRON_Mailbox_Control) \ - ) - -/* - * _ITRON_Mailbox_Clarify_allocation_id_error - */ - -#define _ITRON_Mailbox_Clarify_allocation_id_error( _id ) \ - _ITRON_Objects_Clarify_allocation_id_error( \ - &_ITRON_Mailbox_Information, (_id) ) - -/* - * _ITRON_Mailbox_Clarify_get_id_error - */ - -#define _ITRON_Mailbox_Clarify_get_id_error( _id ) \ - _ITRON_Objects_Clarify_get_id_error( &_ITRON_Mailbox_Information, (_id) ) - -/* - * _ITRON_Mailbox_Free - */ - -#define _ITRON_Mailbox_Free( _the_mailbox ) \ - _ITRON_Objects_Free( &_ITRON_Mailbox_Information, &(_the_mailbox)->Object ) - -/*PAGE - * - * _ITRON_Mailbox_Get - */ - -#define _ITRON_Mailbox_Get( _id, _location ) \ - (ITRON_Mailbox_Control *) \ - _ITRON_Objects_Get( &_ITRON_Mailbox_Information, (_id), (_location) ) - -/*PAGE - * - * _ITRON_Mailbox_Is_null - */ - -#define _ITRON_Mailbox_Is_null( _the_mailbox ) \ - ( (_the_mailbox) == NULL ) - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/macros/rtems/itron/msgbuffer.inl b/cpukit/itron/macros/rtems/itron/msgbuffer.inl deleted file mode 100644 index 6a4f8fc4b1..0000000000 --- a/cpukit/itron/macros/rtems/itron/msgbuffer.inl +++ /dev/null @@ -1,82 +0,0 @@ -/** - * @file rtems/itron/msgbuffer.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_MSGBUFFER_INL -#define _RTEMS_ITRON_MSGBUFFER_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * _ITRON_Message_buffer_Allocate - */ - -#define _ITRON_Message_buffer_Allocate( _mbfid ) \ - (ITRON_Message_buffer_Control *)_ITRON_Objects_Allocate_by_index( \ - &_ITRON_Message_buffer_Information, \ - (_mbfid), \ - sizeof(ITRON_Message_buffer_Control) \ - ) - -/* - * _ITRON_Message_buffer_Clarify_allocation_id_error - */ - -#define _ITRON_Message_buffer_Clarify_allocation_id_error( _id ) \ - _ITRON_Objects_Clarify_allocation_id_error( \ - &_ITRON_Message_buffer_Information, (_id) ) - -/* - * _ITRON_Message_buffer_Clarify_get_id_error - */ - -#define _ITRON_Message_buffer_Clarify_get_id_error( _id ) \ - _ITRON_Objects_Clarify_get_id_error( &_ITRON_Message_buffer_Information, (_id) ) - -/* - * _ITRON_Message_buffer_Free - */ - -#define _ITRON_Message_buffer_Free( _the_message_buffer ) \ - _ITRON_Objects_Free( \ - &_ITRON_Message_buffer_Information, \ - &(_the_message_buffer)->Object \ - ) - -/*PAGE - * - * _ITRON_Message_buffer_Get - */ - -#define _ITRON_Message_buffer_Get( _id, _location ) \ - (ITRON_Message_buffer_Control *) \ - _ITRON_Objects_Get( &_ITRON_Message_buffer_Information, (_id), (_location) ) - -/*PAGE - * - * _ITRON_Message_buffer_Is_null - */ - -#define _ITRON_Message_buffer_Is_null( _the_message_buffer ) \ - ( (_the_message_buffer) == NULL ) - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/macros/rtems/itron/network.inl b/cpukit/itron/macros/rtems/itron/network.inl deleted file mode 100644 index 6c8095c176..0000000000 --- a/cpukit/itron/macros/rtems/itron/network.inl +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file rtems/itron/network.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_NETWORK_INL -#define _RTEMS_ITRON_NETWORK_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * XXX insert inline routines here - */ - - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/macros/rtems/itron/port.inl b/cpukit/itron/macros/rtems/itron/port.inl deleted file mode 100644 index 153611d8b9..0000000000 --- a/cpukit/itron/macros/rtems/itron/port.inl +++ /dev/null @@ -1,79 +0,0 @@ -/** - * @file rtems/itron/port.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_PORT_INL -#define _RTEMS_ITRON_PORT_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * _ITRON_Port_Allocate - */ - -#define _ITRON_Port_Allocate( _porid ) \ - (ITRON_Port_Control *)_ITRON_Objects_Allocate_by_index( \ - &_ITRON_Port_Information, \ - (_porid), \ - sizeof(ITRON_Port_Control) \ - ) - -/* - * _ITRON_Port_Clarify_allocation_id_error - */ - -#define _ITRON_Port_Clarify_allocation_id_error( _id ) \ - _ITRON_Objects_Clarify_allocation_id_error( \ - &_ITRON_Port_Information, (_id) ) - -/* - * _ITRON_Port_Clarify_get_id_error - */ - -#define _ITRON_Port_Clarify_get_id_error( _id ) \ - _ITRON_Objects_Clarify_get_id_error( &_ITRON_Port_Information, (_id) ) - -/* - * _ITRON_Port_Free - */ - -#define _ITRON_Port_Free( _the_port ) \ - _ITRON_Objects_Free( &_ITRON_Port_Information, &(_the_port)->Object ) - -/*PAGE - * - * _ITRON_Port_Get - */ - -#define _ITRON_Port_Get( _id, _location ) \ - (ITRON_Port_Control *) \ - _ITRON_Objects_Get( &_ITRON_Port_Information, (_id), (_location) ) - -/*PAGE - * - * _ITRON_Port_Is_null - */ - -#define _ITRON_Port_Is_null( _the_port ) \ - ( (_the_port) == NULL ) - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/macros/rtems/itron/semaphore.inl b/cpukit/itron/macros/rtems/itron/semaphore.inl deleted file mode 100644 index bdf8020e3d..0000000000 --- a/cpukit/itron/macros/rtems/itron/semaphore.inl +++ /dev/null @@ -1,106 +0,0 @@ -/** - * @file rtems/itron/semaphore.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_SEMAPHORE_INL -#define _RTEMS_ITRON_SEMAPHORE_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * _ITRON_Semaphore_Allocate - */ - -#define _ITRON_Semaphore_Allocate( _semid ) \ - (ITRON_Semaphore_Control *)_ITRON_Objects_Allocate_by_index( \ - &_ITRON_Semaphore_Information, \ - (_semid), \ - sizeof(ITRON_Semaphore_Control) \ - ) - -/* - * _ITRON_Semaphore_Clarify_allocation_id_error - */ - -#define _ITRON_Semaphore_Clarify_allocation_id_error( _id ) \ - _ITRON_Objects_Clarify_allocation_id_error( \ - &_ITRON_Semaphore_Information, (_id) ) - -/* - * _ITRON_Semaphore_Clarify_get_id_error - */ - -#define _ITRON_Semaphore_Clarify_get_id_error( _id ) \ - _ITRON_Objects_Clarify_get_id_error( &_ITRON_Semaphore_Information, (_id) ) - -/* - * _ITRON_Semaphore_Free - */ - -#define _ITRON_Semaphore_Free( _the_semaphore ) \ - _ITRON_Objects_Free( &_ITRON_Semaphore_Information, &(_the_semaphore)->Object ) - -/*PAGE - * - * _ITRON_Semaphore_Get - */ - -#define _ITRON_Semaphore_Get( _id, _location ) \ - (ITRON_Semaphore_Control *) \ - _ITRON_Objects_Get( &_ITRON_Semaphore_Information, (_id), (_location) ) - -/*PAGE - * - * _ITRON_Semaphore_Is_null - */ - -#define _ITRON_Semaphore_Is_null( _the_semaphore ) \ - ( (_the_semaphore) == NULL ) - -/* - * _ITRON_Semaphore_Translate_core_semaphore_return_code - */ - -/* XXX fix me */ -static inline ER _ITRON_Semaphore_Translate_core_semaphore_return_code ( - uint32_t the_semaphore_status -) -{ -/* XXX need to be able to return "E_RLWAI" */ - switch ( the_semaphore_status ) { - case CORE_SEMAPHORE_STATUS_SUCCESSFUL: - return E_OK; - case CORE_SEMAPHORE_STATUS_UNSATISFIED_NOWAIT: - return E_TMOUT; - case CORE_SEMAPHORE_WAS_DELETED: - return E_DLT; - case CORE_SEMAPHORE_TIMEOUT: - return E_TMOUT; - case CORE_SEMAPHORE_MAXIMUM_COUNT_EXCEEDED: - return E_QOVR; - case THREAD_STATUS_PROXY_BLOCKING: - return THREAD_STATUS_PROXY_BLOCKING; - } - return E_OK; /* unreached - only to remove warnings */ -} - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/macros/rtems/itron/sysmgmt.inl b/cpukit/itron/macros/rtems/itron/sysmgmt.inl deleted file mode 100644 index 81b66c82bf..0000000000 --- a/cpukit/itron/macros/rtems/itron/sysmgmt.inl +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file rtems/itron/sysmgmt.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_SYSMGMT_INL -#define _RTEMS_ITRON_SYSMGMT_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * XXX insert inline routines here - */ - - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/macros/rtems/itron/task.inl b/cpukit/itron/macros/rtems/itron/task.inl deleted file mode 100644 index ae4551181d..0000000000 --- a/cpukit/itron/macros/rtems/itron/task.inl +++ /dev/null @@ -1,106 +0,0 @@ -/** - * @file rtems/itron/task.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_TASK_INL -#define _RTEMS_ITRON_TASK_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * _ITRON_Task_Allocate - */ - -#define _ITRON_Task_Allocate( _tskid ) \ - (Thread_Control *)_ITRON_Objects_Allocate_by_index( \ - &_ITRON_Task_Information, \ - (_tskid), \ - sizeof(Thread_Control) \ - ) - -/* - * _ITRON_Task_Clarify_allocation_id_error - */ - -#define _ITRON_Task_Clarify_allocation_id_error( _id ) \ - _ITRON_Objects_Clarify_allocation_id_error( \ - &_ITRON_Task_Information, (_id) ) - -/* - * _ITRON_Task_Clarify_get_id_error - */ - -#define _ITRON_Task_Clarify_get_id_error( _id ) \ - _ITRON_Objects_Clarify_get_id_error( &_ITRON_Task_Information, (_id) ) - -/* - * _ITRON_Task_Free - */ - -#define _ITRON_Task_Free( _the_task ) \ - _ITRON_Objects_Free( &_ITRON_Task_Information, &(_the_task)->Object ) - -/*PAGE - * - * _ITRON_Task_Get - */ - -/* XXX fix me */ -static inline Thread_Control *_ITRON_Task_Get ( - ID id, - Objects_Locations *location -) -{ - if ( id == 0 ) { - _Thread_Disable_dispatch(); - *location = OBJECTS_LOCAL; - return _Thread_Executing; - } - - return (Thread_Control *) - _ITRON_Objects_Get( &_ITRON_Task_Information, id, location ); -} - -/*PAGE - * - * _ITRON_Task_Is_null - */ - -#define _ITRON_Task_Is_null( _the_task ) \ - ( (_the_task) == NULL ) - -/*PAGE - * - * _ITRON_tasks_Priority_to_Core - */ - -#define _ITRON_Task_Priority_to_Core( _ITRON_priority ) \ - ((Priority_Control) (_ITRON_priority)) - -/*PAGE - * - * _ITRON_tasks_Core_to_Priority - */ - -#define _ITRON_Task_Core_to_Priority( _core_priority ) \ - ((PRI) (_core_priority)) - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ diff --git a/cpukit/itron/macros/rtems/itron/time.inl b/cpukit/itron/macros/rtems/itron/time.inl deleted file mode 100644 index 39f195cf3d..0000000000 --- a/cpukit/itron/macros/rtems/itron/time.inl +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file rtems/itron/time.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_TIME_INL -#define _RTEMS_ITRON_TIME_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * XXX insert inline routines here - */ - - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/macros/rtems/itron/vmempool.inl b/cpukit/itron/macros/rtems/itron/vmempool.inl deleted file mode 100644 index 503d4a3301..0000000000 --- a/cpukit/itron/macros/rtems/itron/vmempool.inl +++ /dev/null @@ -1,85 +0,0 @@ -/** - * @file rtems/itron/vmempool.inl - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_ITRON_VMEMPOOL_INL -#define _RTEMS_ITRON_VMEMPOOL_INL - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * _ITRON_Variable_memory_pool_Allocate - */ - -#define _ITRON_Variable_memory_pool_Allocate( _mplid ) \ - (ITRON_Variable_memory_pool_Control *)_ITRON_Objects_Allocate_by_index( \ - &_ITRON_Variable_memory_pool_Information, \ - (_mplid), \ - sizeof(ITRON_Variable_memory_pool_Control) \ - ) - -/* - * _ITRON_Variable_memory_pool_Clarify_allocation_id_error - */ - -#define _ITRON_Variable_memory_pool_Clarify_allocation_id_error( _id ) \ - _ITRON_Objects_Clarify_allocation_id_error( \ - &_ITRON_Variable_memory_pool_Information, (_id) ) - -/* - * _ITRON_Variable_memory_pool_Clarify_get_id_error - */ - -#define _ITRON_Variable_memory_pool_Clarify_get_id_error( _id ) \ - _ITRON_Objects_Clarify_get_id_error( &_ITRON_Variable_memory_pool_Information, (_id) ) - -/* - * _ITRON_Variable_memory_pool_Free - */ - -#define _ITRON_Variable_memory_pool_Free( _the_variable_memory_pool ) \ - _ITRON_Objects_Free( \ - &_ITRON_Variable_memory_pool_Information, \ - &(_the_variable_memory_pool)->Object \ - ) - -/*PAGE - * - * _ITRON_Variable_memory_pool_Get - */ - -#define _ITRON_Variable_memory_pool_Get( _id, _location ) \ - (ITRON_Variable_memory_pool_Control *) _ITRON_Objects_Get( \ - &_ITRON_Variable_memory_pool_Information, \ - (_id), \ - (_location) \ - ) - -/*PAGE - * - * _ITRON_Variable_memory_pool_Is_null - */ - -#define _ITRON_Variable_memory_pool_Is_null( _the_variable_memory_pool ) \ - ( (_the_variable_memory_pool) == NULL ) - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ - diff --git a/cpukit/itron/preinstall.am b/cpukit/itron/preinstall.am index 60916a37e8..c3298eb06a 100644 --- a/cpukit/itron/preinstall.am +++ b/cpukit/itron/preinstall.am @@ -149,7 +149,6 @@ $(PROJECT_INCLUDE)/rtems/itron/vmempool.h: include/rtems/itron/vmempool.h $(PROJ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/vmempool.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/vmempool.h -if INLINE $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl: inline/rtems/itron/eventflags.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl @@ -197,54 +196,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/time.inl $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl: inline/rtems/itron/vmempool.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl - -else -$(PROJECT_INCLUDE)/rtems/itron/eventflags.inl: macros/rtems/itron/eventflags.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl - -$(PROJECT_INCLUDE)/rtems/itron/fmempool.inl: macros/rtems/itron/fmempool.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/fmempool.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/fmempool.inl - -$(PROJECT_INCLUDE)/rtems/itron/intr.inl: macros/rtems/itron/intr.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/intr.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/intr.inl - -$(PROJECT_INCLUDE)/rtems/itron/mbox.inl: macros/rtems/itron/mbox.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/mbox.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/mbox.inl - -$(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl: macros/rtems/itron/msgbuffer.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl - -$(PROJECT_INCLUDE)/rtems/itron/network.inl: macros/rtems/itron/network.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/network.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/network.inl - -$(PROJECT_INCLUDE)/rtems/itron/port.inl: macros/rtems/itron/port.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/port.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/port.inl - -$(PROJECT_INCLUDE)/rtems/itron/semaphore.inl: macros/rtems/itron/semaphore.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/semaphore.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/semaphore.inl - -$(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl: macros/rtems/itron/sysmgmt.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl - -$(PROJECT_INCLUDE)/rtems/itron/task.inl: macros/rtems/itron/task.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/task.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/task.inl - -$(PROJECT_INCLUDE)/rtems/itron/time.inl: macros/rtems/itron/time.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/time.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/time.inl - -$(PROJECT_INCLUDE)/rtems/itron/vmempool.inl: macros/rtems/itron/vmempool.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl -endif endif -- cgit v1.2.3