SPARC port passes all tests

2 files changed, 12 insertions, 30 deletions

diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c b/c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c
index efe0225520..7c8f9617e7 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c
@@ -105,7 +105,7 @@ void Install_clock(
    */
 
   if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = ( rtems_isr_entry ) set_vector( clock_isr, CLOCK_VECTOR, 1 );
+    Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
     /*
      *  Hardware specific initialize goes here
      */
@@ -121,30 +121,6 @@ void Install_clock(
 }
 
 /*
- *  Reinstall_clock
- *
- *  Install a clock tick handler without reprogramming the chip.  This
- *  is used by the polling shared memory device driver.
- */
-
-void ReInstall_clock(
-  rtems_isr_entry clock_isr
-)
-{
-  rtems_unsigned32 isrlevel = 0;
-
-  /*
-   *  Disable interrupts and install the clock ISR vector using the
-   *  BSP dependent set_vector routine.  In the below example, the clock
-   *  ISR is on vector 4 and is an RTEMS interrupt.
-   */
-
-  rtems_interrupt_disable( isrlevel );
-   (void) set_vector( clock_isr, CLOCK_VECTOR, 1 );
-  rtems_interrupt_enable( isrlevel );
-}
-
-/*
  *  Clean up before the application exits
  */
 
@@ -188,6 +164,7 @@ rtems_device_driver Clock_control(
   void *pargp
 )
 {
+    rtems_unsigned32 isrlevel;
     rtems_libio_ioctl_args_t *args = pargp;
  
     if (args == 0)
@@ -204,7 +181,9 @@ rtems_device_driver Clock_control(
     }
     else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
     {
-        ReInstall_clock(args->buffer);
+      rtems_interrupt_disable( isrlevel );
+       (void) set_vector( args->buffer, CLOCK_VECTOR, 1 );
+      rtems_interrupt_enable( isrlevel );
     }
  
 done:
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
index e28e791503..7f08b779dd 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
@@ -131,18 +131,21 @@ void
 bsp_postdriver_hook(void)
 {
   int stdin_fd, stdout_fd, stderr_fd;
+  int error_code;
+ 
+  error_code = 'S' << 24 | 'T' << 16;
  
   if ((stdin_fd = __open("/dev/console", O_RDONLY, 0)) == -1)
-    rtems_fatal_error_occurred('STD0');
+    rtems_fatal_error_occurred( error_code | 'D' << 8 | '0' );
  
   if ((stdout_fd = __open("/dev/console", O_WRONLY, 0)) == -1)
-    rtems_fatal_error_occurred('STD1');
+    rtems_fatal_error_occurred( error_code | 'D' << 8 | '1' );
  
   if ((stderr_fd = __open("/dev/console", O_WRONLY, 0)) == -1)
-    rtems_fatal_error_occurred('STD2');
+    rtems_fatal_error_occurred( error_code | 'D' << 8 | '2' );
  
   if ((stdin_fd != 0) || (stdout_fd != 1) || (stderr_fd != 2))
-    rtems_fatal_error_occurred('STIO');
+    rtems_fatal_error_occurred( error_code | 'I' << 8 | 'O' );
 }
 
 int bsp_start(