diff options
-rw-r--r-- | cpukit/ChangeLog | 6 | ||||
-rw-r--r-- | cpukit/libcsupport/src/base_fs.c | 25 | ||||
-rw-r--r-- | cpukit/rtems/src/taskcreate.c | 5 | ||||
-rw-r--r-- | cpukit/rtems/src/tasks.c | 5 | ||||
-rw-r--r-- | cpukit/score/src/coremutex.c | 11 |
5 files changed, 10 insertions, 42 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index c8793dd3c5..bd15642ab7 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2006-06-22 Joel Sherrill <joel@OARcorp.com> + + PR 1101/rtems + * libcsupport/src/base_fs.c, rtems/src/taskcreate.c, rtems/src/tasks.c, + score/src/coremutex.c: Remove dead code. + 2006-06-18 Ralf Corsépius <ralf.corsepius@rtems.org> * libcsupport/include/rtems/libio.h: Add extern "C" {}. diff --git a/cpukit/libcsupport/src/base_fs.c b/cpukit/libcsupport/src/base_fs.c index dedafc8d1c..d8e2821c46 100644 --- a/cpukit/libcsupport/src/base_fs.c +++ b/cpukit/libcsupport/src/base_fs.c @@ -43,9 +43,6 @@ rtems_user_env_t * rtems_current_user_env = &rtems_global_user_env; void rtems_filesystem_initialize( void ) { #if !defined(RTEMS_UNIX) -#if 0 - int i; -#endif int status; rtems_filesystem_mount_table_entry_t *entry; rtems_filesystem_mount_table_t *mt; @@ -124,27 +121,13 @@ void rtems_filesystem_initialize( void ) rtems_fatal_error_occurred( 0xABCD0003 ); /* - * This code if if'ed 0 out because you can't mount another - * filesystem properly until the mount point it will be - * mounted onto is created. Moreover, if it is going to + * You can't mount another filesystem properly until the mount point + * it will be mounted onto is created. Moreover, if it is going to * use a device, then it is REALLY unfair to attempt this - * before device drivers are initialized. - */ - -#if 0 - /* - * Now if there are other filesystems to mount, go for it. + * before device drivers are initialized. So we return via a base + * filesystem image and nothing auto-mounted at this point. */ - for ( i=1 ; i < rtems_filesystem_mount_table_size ; i++ ) { - mt = &rtems_filesystem_mount_table[0]; - - status = mount( - &entry, mt->fs_ops, mt->fsoptions, mt->device, mt->mount_point ); - - if ( status == -1 ) - rtems_fatal_error_occurred( 0xABCD0003 ); - } #endif #endif } diff --git a/cpukit/rtems/src/taskcreate.c b/cpukit/rtems/src/taskcreate.c index a98db746d5..5360d980b4 100644 --- a/cpukit/rtems/src/taskcreate.c +++ b/cpukit/rtems/src/taskcreate.c @@ -87,11 +87,6 @@ rtems_status_code rtems_task_create( * stack space. */ -#if 0 - if ( !_Stack_Is_enough( stack_size ) ) - return RTEMS_INVALID_SIZE; -#endif - /* * Fix the attribute set to match the attributes which * this processor (1) requires and (2) is able to support. diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c index ba2fb91769..5805cf7823 100644 --- a/cpukit/rtems/src/tasks.c +++ b/cpukit/rtems/src/tasks.c @@ -256,11 +256,6 @@ void _RTEMS_tasks_Manager_initialization( * There may not be any RTEMS initialization tasks configured. */ -#if 0 - if ( user_tasks == NULL || number_of_initialization_tasks == 0 ) - _Internal_error_Occurred( INTERNAL_ERROR_RTEMS_API, TRUE, RTEMS_TOO_MANY ); -#endif - _Objects_Initialize_information( &_RTEMS_tasks_Information, /* object information table */ OBJECTS_CLASSIC_API, /* object API */ diff --git a/cpukit/score/src/coremutex.c b/cpukit/score/src/coremutex.c index ea187d9290..173418ffc0 100644 --- a/cpukit/score/src/coremutex.c +++ b/cpukit/score/src/coremutex.c @@ -58,17 +58,6 @@ void _CORE_mutex_Initialize( the_mutex->lock = initial_lock; the_mutex->blocked_count = 0; -#if 0 - if ( !the_mutex_attributes->only_owner_release && - the_mutex_attributes->nesting_allowed ) { - _Internal_error_Occurred( - INTERNAL_ERROR_CORE, - TRUE, - INTERNAL_ERROR_BAD_ATTRIBUTES - ); - } -#endif - if ( initial_lock == CORE_MUTEX_LOCKED ) { the_mutex->nest_count = 1; the_mutex->holder = _Thread_Executing; |