Hi, two fixes for latest fusion CVS:
The first one deals with the new serial driver. It clears the internal error state after changing the serial line setup. The second one addresses a copy&paste mistake introduced with latest /proc/rtai/config.gz support. Greetings, Jan
Index: drivers/16550A/16550A.c
===================================================================
RCS file: /cvs/rtai/fusion/drivers/16550A/16550A.c,v
retrieving revision 1.21
diff -n -u -p -r1.21 16550A.c
--- drivers/16550A/16550A.c 6 Sep 2005 20:54:02 -0000 1.21
+++ drivers/16550A/16550A.c 13 Sep 2005 15:29:56 -0000
@@ -322,9 +322,12 @@ static int rt_16550_set_config(struct rt
ctx->config.stop_bits = config->stop_bits & STOP_BITS_MASK;
if (testbits(config->config_mask, RTSER_SET_PARITY | RTSER_SET_DATA_BITS |
- RTSER_SET_STOP_BITS | RTSER_SET_BAUD))
+ RTSER_SET_STOP_BITS | RTSER_SET_BAUD)) {
outb((ctx->config.parity << 3) | (ctx->config.stop_bits << 2) |
ctx->config.data_bits, LCR(dev_id));
+ ctx->status = 0;
+ ctx->ioc_events &= ~RTSER_EVENT_ERRPEND;
+ }
if (testbits(config->config_mask, RTSER_SET_FIFO_DEPTH)) {
ctx->config.fifo_depth = config->fifo_depth & FIFO_MASK;
Index: configure.in =================================================================== RCS file: /cvs/rtai/fusion/configure.in,v retrieving revision 1.139 diff -n -u -p -r1.139 configure.in --- configure.in 13 Sep 2005 07:22:00 -0000 1.139 +++ configure.in 13 Sep 2005 15:29:17 -0000 @@ -1222,7 +1222,7 @@ AM_CONDITIONAL(CONFIG_RTAI_HW_FPU,[test dnl Nucleus options AM_CONDITIONAL(CONFIG_RTAI_OPT_FUSION,[test x$CONFIG_RTAI_OPT_FUSION = xy]) AM_CONDITIONAL(CONFIG_RTAI_OPT_PIPE,[test x$CONFIG_RTAI_OPT_PIPE = xy]) -AM_CONDITIONAL(CONFIG_RTAI_OPT_CONFIG_GZ,[test x$CONFIG_RTAI_OPT_PIPE = xy]) +AM_CONDITIONAL(CONFIG_RTAI_OPT_CONFIG_GZ,[test x$CONFIG_RTAI_OPT_CONFIG_GZ = xy]) dnl Supported skins AM_CONDITIONAL(CONFIG_RTAI_SKIN_POSIX,[test x$CONFIG_RTAI_SKIN_POSIX = xy])
signature.asc
Description: OpenPGP digital signature
