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

2011-08-29 Joel Sherrill <joel.sherrilL@OARcorp.com>

Browse Source 
* include/rtems/userenv.h, score/src/threadhandler.c: Formatting.
	* sapi/src/exshutdown.c: Add comments.
This commit is contained in:
Joel Sherrill
2011-08-29 21:30:32 +00:00
parent 2996b9b14d
commit adae165b7a
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/ChangeLog
View File

@@ -1,3 +1,8 @@
2011-08-29 Joel Sherrill <joel.sherrilL@OARcorp.com>
* include/rtems/userenv.h, score/src/threadhandler.c: Formatting.
* sapi/src/exshutdown.c: Add comments.
2011-08-22 Jennifer Averett <Jennifer.Averett@OARcorp.com> 2011-08-22 Jennifer Averett <Jennifer.Averett@OARcorp.com>
PR 1876 PR 1876

27
cpukit/include/rtems/userenv.h
View File

@@ -46,20 +46,19 @@ extern "C" {
#endif #endif
typedef struct { typedef struct {
rtems_id task_id; rtems_id task_id;
rtems_filesystem_location_info_t current_directory; rtems_filesystem_location_info_t current_directory;
rtems_filesystem_location_info_t root_directory; rtems_filesystem_location_info_t root_directory;
/* Default mode for all files. */ /* Default mode for all files. */
mode_t umask; mode_t umask;
nlink_t link_counts; nlink_t link_counts;
/* _POSIX_types */ /* _POSIX_types */
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;
uid_t euid; uid_t euid;
gid_t egid; gid_t egid;
char login_buffer[LOGIN_NAME_MAX]; char login_buffer[LOGIN_NAME_MAX];
pid_t pgrp; /* process group id */
pid_t pgrp; /* process group id */
} rtems_user_env_t; } rtems_user_env_t;
extern rtems_user_env_t * rtems_current_user_env; extern rtems_user_env_t * rtems_current_user_env;

10
cpukit/sapi/src/exshutdown.c
View File

@@ -49,11 +49,19 @@ void rtems_shutdown_executive(
_System_state_Set( SYSTEM_STATE_SHUTDOWN ); _System_state_Set( SYSTEM_STATE_SHUTDOWN );
_Thread_Stop_multitasking(); _Thread_Stop_multitasking();
/*******************************************************************
*******************************************************************
*******************************************************************
****** RETURN TO RTEMS_INITIALIZE_START_MULTITASKING() ******
****** AND THEN TO BOOT_CARD() ******
*******************************************************************
*******************************************************************
*******************************************************************/
} }
_Internal_error_Occurred( _Internal_error_Occurred(
INTERNAL_ERROR_CORE, INTERNAL_ERROR_CORE,
true, true,
INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP
); );
} }

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

@@ -29,7 +29,15 @@
#include <rtems/score/threadq.h> #include <rtems/score/threadq.h>
#include <rtems/score/userext.h> #include <rtems/score/userext.h>
#include <rtems/score/wkspace.h> #include <rtems/score/wkspace.h>
#if defined(RTEMS_SMP)
#include <rtems/score/smp.h>
#endif
/*
* Conditional magic to determine what style of C++ constructor
* initialization this target and compiler version uses.
*/
#if defined(__AVR__) #if defined(__AVR__)
#undef __USE_INIT_FINI__ #undef __USE_INIT_FINI__
#endif #endif
@@ -53,11 +61,6 @@
#define EXECUTE_GLOBAL_CONSTRUCTORS #define EXECUTE_GLOBAL_CONSTRUCTORS
#endif #endif
#if defined(RTEMS_SMP)
#include <rtems/score/smp.h>
#endif
/* /*
* _Thread_Handler * _Thread_Handler
* *
@@ -81,7 +84,6 @@
* *
* Output parameters: NONE * Output parameters: NONE
*/ */
void _Thread_Handler( void ) void _Thread_Handler( void )
{ {
ISR_Level level; ISR_Level level;
@@ -104,7 +106,6 @@ void _Thread_Handler( void )
* have to put level into a register for those cpu's that use * have to put level into a register for those cpu's that use
* inline asm here * inline asm here
*/ */
level = executing->Start.isr_level; level = executing->Start.isr_level;
_ISR_Set_level(level); _ISR_Set_level(level);
@@ -150,7 +151,6 @@ void _Thread_Handler( void )
_SMP_Request_other_cores_to_perform_first_context_switch(); _SMP_Request_other_cores_to_perform_first_context_switch();
_Thread_Enable_dispatch(); _Thread_Enable_dispatch();
#endif #endif
} }
#endif #endif