diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-10-04 13:47:31 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-10-04 13:47:31 +0000 |
| commit | cb6208444b666a20dae4beb97da95f9c572528c8 (patch) | |
| tree | 14dfef5680202e59c46eca091b00c20a555593fc | |
| parent | Modified to setup environment pointer on all BSPs. This results (diff) | |
| download | rtems-cb6208444b666a20dae4beb97da95f9c572528c8.tar.bz2 | |
Patch from Eric Norum <eric@cls.usask.ca> to ensure the console
initialization is only done once.
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/console/console.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68360/console/console.c b/c/src/lib/libbsp/m68k/gen68360/console/console.c index 63031ccbd6..f31936144a 100644 --- a/c/src/lib/libbsp/m68k/gen68360/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68360/console/console.c @@ -138,8 +138,8 @@ smc1InterruptHandler (rtems_vector_number v) m360.cisr = 1UL << 4; /* Clear SMC1 interrupt-in-service bit */ } -static void -smc1Initialize (void) +static int +smc1Initialize (int major, int minor, void *arg) { /* * Allocate buffer descriptors @@ -224,6 +224,8 @@ smc1Initialize (void) m360.smc1.smcm = 3; /* Enable SMC1 TX and RX interrupts */ m360.cimr |= 1UL << 4; /* Enable SMC1 interrupts */ } + + return 0; } static int @@ -302,11 +304,6 @@ rtems_device_driver console_initialize( rtems_termios_initialize (); /* - * Do device-specific initialization - */ - smc1Initialize (); - - /* * Register the device */ status = rtems_io_register_name ("/dev/console", major, 0); @@ -326,7 +323,7 @@ rtems_device_driver console_open( { rtems_status_code sc; static const rtems_termios_callbacks intrCallbacks = { - NULL, /* firstOpen */ + smc1Initialize, /* firstOpen */ NULL, /* lastClose */ NULL, /* pollRead */ smc1InterruptWrite, /* write */ @@ -336,7 +333,7 @@ rtems_device_driver console_open( 1 /* outputUsesInterrupts */ }; static const rtems_termios_callbacks pollCallbacks = { - NULL, /* firstOpen */ + smc1Initialize, /* firstOpen */ NULL, /* lastClose */ smc1PollRead, /* pollRead */ smc1PollWrite, /* write */ @@ -346,6 +343,9 @@ rtems_device_driver console_open( 0 /* outputUsesInterrupts */ }; + /* + * Do generic termios initialization + */ if (m360_smc1_interrupt) { rtems_libio_open_close_args_t *args = arg; |