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

	* include/rtems/userenv.h, score/src/threadhandler.c: Formatting.
	* sapi/src/exshutdown.c: Add comments.

4 files changed, 35 insertions, 23 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 2ec73db086..b49b9fa60f 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -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>
 
 	PR 1876
diff --git a/cpukit/include/rtems/userenv.h b/cpukit/include/rtems/userenv.h
index ca27c54b15..28ac69ebd3 100644
--- a/cpukit/include/rtems/userenv.h
+++ b/cpukit/include/rtems/userenv.h
@@ -46,20 +46,19 @@ extern "C" {
 #endif
 
 typedef struct {
- rtems_id                         task_id;
- rtems_filesystem_location_info_t current_directory;
- rtems_filesystem_location_info_t root_directory;
- /* Default mode for all files. */
- mode_t                           umask;
- nlink_t                          link_counts;
- /* _POSIX_types */
- uid_t                            uid;
- gid_t                            gid;
- uid_t                            euid;
- gid_t                            egid;
- char      login_buffer[LOGIN_NAME_MAX];
-
- pid_t                            pgrp; /* process group id */
+  rtems_id                         task_id;
+  rtems_filesystem_location_info_t current_directory;
+  rtems_filesystem_location_info_t root_directory;
+  /* Default mode for all files. */
+  mode_t                           umask;
+  nlink_t                          link_counts;
+  /* _POSIX_types */
+  uid_t                            uid;
+  gid_t                            gid;
+  uid_t                            euid;
+  gid_t                            egid;
+  char      login_buffer[LOGIN_NAME_MAX];
+  pid_t                            pgrp; /* process group id */
 } rtems_user_env_t;
 
 extern rtems_user_env_t * rtems_current_user_env;
diff --git a/cpukit/sapi/src/exshutdown.c b/cpukit/sapi/src/exshutdown.c
index f004dbd755..0d3d8794c7 100644
--- a/cpukit/sapi/src/exshutdown.c
+++ b/cpukit/sapi/src/exshutdown.c
@@ -49,11 +49,19 @@ void rtems_shutdown_executive(
 
     _System_state_Set( SYSTEM_STATE_SHUTDOWN );
     _Thread_Stop_multitasking();
+
+    /*******************************************************************
+     *******************************************************************
+     *******************************************************************
+     ******     RETURN TO RTEMS_INITIALIZE_START_MULTITASKING()   ******
+     ******                 AND THEN TO BOOT_CARD()               ******
+     *******************************************************************
+     *******************************************************************
+     *******************************************************************/
   }
   _Internal_error_Occurred(
     INTERNAL_ERROR_CORE,
     true,
     INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP
   );
-
 }
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index b121809e4f..c688432715 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -29,7 +29,15 @@
 #include <rtems/score/threadq.h>
 #include <rtems/score/userext.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__)
   #undef __USE_INIT_FINI__
 #endif
@@ -53,11 +61,6 @@
   #define EXECUTE_GLOBAL_CONSTRUCTORS
 #endif
 
-#if defined(RTEMS_SMP)
-  #include <rtems/score/smp.h>
-#endif
-
-
 /*
  *  _Thread_Handler
  *
@@ -81,7 +84,6 @@
  *
  *  Output parameters:  NONE
  */
-
 void _Thread_Handler( void )
 {
   ISR_Level  level;
@@ -104,7 +106,6 @@ void _Thread_Handler( void )
    * have to put level into a register for those cpu's that use
    * inline asm here
    */
-
   level = executing->Start.isr_level;
   _ISR_Set_level(level);
 
@@ -150,7 +151,6 @@ void _Thread_Handler( void )
           _SMP_Request_other_cores_to_perform_first_context_switch();
         _Thread_Enable_dispatch();
       #endif
-
     }
  #endif