diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-09-30 04:02:40 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-09-30 04:02:40 +0000 |
| commit | 64a1529c263ff7947d73dad30c7af75152781d3c (patch) | |
| tree | a92cf9b9030aa84af0b8467466ccc8a2cafda39e /c | |
| parent | 2009-09-30 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-64a1529c263ff7947d73dad30c7af75152781d3c.tar.bz2 | |
2009-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* libchip/serial/z85c30.c, libchip/serial/ns16550.c,
libchip/serial/mc68681.c: Reflect termios_baud_to_number having been
renamed to rtems_termios_baud_to_number.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/libchip/serial/mc68681.c | 2 | ||||
| -rw-r--r-- | c/src/libchip/serial/ns16550.c | 5 | ||||
| -rw-r--r-- | c/src/libchip/serial/z85c30.c | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 57c458ae20..5b2945b56f 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,5 +1,11 @@ 2009-09-30 Ralf Corsépius <ralf.corsepius@rtems.org> + * libchip/serial/z85c30.c, libchip/serial/ns16550.c, + libchip/serial/mc68681.c: Reflect termios_baud_to_number having been + renamed to rtems_termios_baud_to_number. + +2009-09-30 Ralf Corsépius <ralf.corsepius@rtems.org> + * libchip/serial/sersupp.h: Remove termios_baud_to_index, termios_baud_to_number (duplicate prototypes). Add C++-guards. diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c index c471635096..2d2bf86c87 100644 --- a/c/src/libchip/serial/mc68681.c +++ b/c/src/libchip/serial/mc68681.c @@ -590,7 +590,7 @@ MC68681_STATIC int mc68681_baud_rate( if (!baud_requested) baud_requested = B9600; /* default to 9600 baud */ - baud_requested = termios_baud_to_index( baud_requested ); + baud_requested = rtems_termios_baud_to_index( baud_requested ); baud_tbl = (mc68681_baud_table_t *) Console_Port_Tbl[minor].ulClock; if (!baud_tbl) diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c index 631625e6a9..f2915f2a50 100644 --- a/c/src/libchip/serial/ns16550.c +++ b/c/src/libchip/serial/ns16550.c @@ -180,7 +180,7 @@ NS16550_STATIC int ns16550_open( } /* Set initial baud */ - rtems_termios_set_initial_baud( tty, (int) c->pDeviceParams); + rtems_termios_set_initial_baud( tty, (int32_t) c->pDeviceParams); return RTEMS_SUCCESSFUL; } @@ -397,7 +397,7 @@ NS16550_STATIC int ns16550_set_attributes( ulBaudDivisor = NS16550_Baud( (uint32_t) Console_Port_Tbl[minor].ulClock, - termios_baud_to_number(baud_requested) + rtems_termios_baud_to_number(baud_requested) ); ucLineControl = 0; @@ -474,7 +474,6 @@ NS16550_STATIC void ns16550_process( int minor) ns16550_context *ctx = d->pDeviceContext; uint32_t port = c->ulCtrlPort1; getRegister_f get = c->getRegister; - setRegister_f set = c->setRegister; int i = 0; char buf [SP_FIFO_SIZE]; diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c index d2b0c62bce..3dedcd0d10 100644 --- a/c/src/libchip/serial/z85c30.c +++ b/c/src/libchip/serial/z85c30.c @@ -452,7 +452,7 @@ Z85C30_STATIC int z85c30_set_attributes( ulBaudDivisor = Z85C30_Baud( (uint32_t) Console_Port_Tbl[minor].ulClock, - (uint32_t) termios_baud_to_number( baud_requested ) + (uint32_t) rtems_termios_baud_to_number( baud_requested ) ); wr3 = SCC_WR3_RX_EN; |