diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1995-10-30 21:54:45 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1995-10-30 21:54:45 +0000 |
| commit | 97005786d89fd7a57b5fe82f713cea739916f3da (patch) | |
| tree | cfff15a6bc93114480ecd20f6afddde3dcd74470 /c/src/lib/libbsp/m68k/idp | |
| parent | reordered test cases from simple to complex (diff) | |
| download | rtems-97005786d89fd7a57b5fe82f713cea739916f3da.tar.bz2 | |
SPARC port passes all tests
Diffstat (limited to 'c/src/lib/libbsp/m68k/idp')
| -rw-r--r-- | c/src/lib/libbsp/m68k/idp/clock/ckinit.c | 15 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/idp/console/duart.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/idp/startup/bspstart.c | 11 |
3 files changed, 14 insertions, 18 deletions
diff --git a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c index 7966fc61d1..6d93523563 100644 --- a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c @@ -130,16 +130,6 @@ rtems_isr_entry clock_isr; } } -void ReInstall_clock( clock_isr ) -rtems_isr_entry clock_isr; -{ - rtems_unsigned32 isrlevel = 0 ; - - rtems_interrupt_disable( isrlevel ); - (void) set_vector( clock_isr, CLOCK_VECTOR, 1 ); - rtems_interrupt_enable( isrlevel ); -} - /* The following was added for debugging purposes */ void Clock_exit( void ) { @@ -181,6 +171,7 @@ rtems_device_driver Clock_control( void *pargp ) { + rtems_unsigned32 isrlevel; rtems_libio_ioctl_args_t *args = pargp; if (args == 0) @@ -197,7 +188,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/m68k/idp/console/duart.c b/c/src/lib/libbsp/m68k/idp/console/duart.c index fe4b657b37..2d82590a49 100644 --- a/c/src/lib/libbsp/m68k/idp/console/duart.c +++ b/c/src/lib/libbsp/m68k/idp/console/duart.c @@ -1,6 +1,6 @@ -# -# $Id$ -# +/* + * $Id$ + */ /*######################################################### # diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c index b4f4928f7d..9c79960580 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/idp/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 main( |