diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2008-11-03 21:01:44 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2008-11-03 21:01:44 +0000 |
| commit | fbed79c01e7ff09eca0bd51f9c1a49bf9a8006b1 (patch) | |
| tree | a56a12b366084d09a7ec7fcc5d9d6aa9755f0f6b | |
| parent | 6cbfae0a9fdbb29e62c231e4a5b75deec70c1e47 (diff) | |
2008-11-03 Till Straumann <strauman@slac.stanford.edu>
PR 1332: call BSP_uart_termios_set()/BSP_uart_intr_ctrl()
only from 'firstOpen' and only if this is a serial console.
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/console/console.c | 17 |
2 files changed, 14 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index e3878e3197..938412007e 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2008-11-03 Till Straumann <strauman@slac.stanford.edu> + + PR 1332: call BSP_uart_termios_set()/BSP_uart_intr_ctrl() + only from 'firstOpen' and only if this is a serial console. + 2007-04-17 Joel Sherrill <joel@OARcorp.com> * psim/tools/runtest: Do not run pppd.exe from batch mode script. diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.c b/c/src/lib/libbsp/powerpc/shared/console/console.c index d99463b184..08f5a01a3f 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/console.c +++ b/c/src/lib/libbsp/powerpc/shared/console/console.c @@ -153,6 +153,15 @@ static int console_first_open(int major, int minor, void *arg) ttyS[minor].name); rtems_fatal_error_occurred(status); } + /* + * Pass data area info down to driver + */ + BSP_uart_termios_set(minor, + ((rtems_libio_open_close_args_t *)arg)->iop->data1); + + /* Enable interrupts on channel */ + BSP_uart_intr_ctrl(minor, BSP_UART_INTR_CTRL_TERMIOS); + return 0; } @@ -204,14 +213,6 @@ console_open(rtems_device_major_number major, return status; } - /* - * Pass data area info down to driver - */ - BSP_uart_termios_set(minor, - ((rtems_libio_open_close_args_t *)arg)->iop->data1); - /* Enable interrupts on channel */ - BSP_uart_intr_ctrl(minor, BSP_UART_INTR_CTRL_TERMIOS); - return RTEMS_SUCCESSFUL; } |