<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-10-10)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ccj</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-10-11 Chris Johns <chrisj@rtems.org>
* console/console.c: Fix the baudrate command line support.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/i386/pc386/ChangeLog.diff?r1=text&tr1=1.261&r2=text&tr2=1.262&diff_format=h">M</a></td><td width='1%'>1.262</td><td width='100%'>c/src/lib/libbsp/i386/pc386/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/i386/pc386/console/console.c.diff?r1=text&tr1=1.49&r2=text&tr2=1.50&diff_format=h">M</a></td><td width='1%'>1.50</td><td width='100%'>c/src/lib/libbsp/i386/pc386/console/console.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.261 rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.262
--- rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.261 Thu Aug 26 23:38:37 2010
+++ rtems/c/src/lib/libbsp/i386/pc386/ChangeLog Sun Oct 10 19:36:48 2010
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2010-10-11 Chris Johns <chrisj@rtems.org>
+
+ * console/console.c: Fix the baudrate command line support.
+<span style="background-color: #FF0000"> </span>
</font> 2010-08-27 Chris Johns <chrisj@rtems.org>
* console/console.c: Add baudrate support to the --console command
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/i386/pc386/console/console.c:1.49 rtems/c/src/lib/libbsp/i386/pc386/console/console.c:1.50
--- rtems/c/src/lib/libbsp/i386/pc386/console/console.c:1.49 Thu Aug 26 23:38:37 2010
+++ rtems/c/src/lib/libbsp/i386/pc386/console/console.c Sun Oct 10 19:36:48 2010
</font><font color='#997700'>@@ -68,7 +68,8 @@
</font> int BSPPrintkPort = BSP_CONSOLE_PORT_CONSOLE;
#endif
<font color='#880000'>-int BSPBaseBaud = 9600;
</font><font color='#000088'>+int BSPBaseBaud = 115200;
+int BSPCmdBaud = 9600;
</font>
extern BSP_polling_getchar_function_type BSP_poll_char;
extern int getch( void );
<font color='#997700'>@@ -185,17 +186,17 @@
</font> {
comma += 1;
if (strncmp (opt, "115200", sizeof ("115200") - 1) == 0)
<font color='#880000'>- BSPBaseBaud = 115200;
</font><font color='#000088'>+ BSPCmdBaud = 115200;
</font> else if (strncmp (opt, "57600", sizeof ("57600") - 1) == 0)
<font color='#880000'>- BSPBaseBaud = 57600;
</font><font color='#000088'>+ BSPCmdBaud = 57600;
</font> else if (strncmp (opt, "38400", sizeof ("38400") - 1) == 0)
<font color='#880000'>- BSPBaseBaud = 38400;
</font><font color='#000088'>+ BSPCmdBaud = 38400;
</font> else if (strncmp (opt, "19200", sizeof ("19200") - 1) == 0)
<font color='#880000'>- BSPBaseBaud = 19200;
</font><font color='#000088'>+ BSPCmdBaud = 19200;
</font> else if (strncmp (opt, "9600", sizeof ("9600") - 1) == 0)
<font color='#880000'>- BSPBaseBaud = 9600;
</font><font color='#000088'>+ BSPCmdBaud = 9600;
</font> else if (strncmp (opt, "4800", sizeof ("4800") - 1) == 0)
<font color='#880000'>- BSPBaseBaud = 9600;
</font><font color='#000088'>+ BSPCmdBaud = 9600;
</font> }
}
<font color='#997700'>@@ -217,6 +218,7 @@
</font>
if(BSPPrintkPort == BSP_UART_COM1)
{
<font color='#000088'>+ printk("Initializing console on port COM1 %d-8-N-1\n\n", BSPCmdBaud);
</font> printk("Warning : This will be the last message on console\n");
/*
<font color='#997700'>@@ -287,8 +289,8 @@
</font> /*
* Do device-specific initialization
*/
<font color='#880000'>- /* BSPBaseBaud-8-N-1 */
- BSP_uart_init(BSPConsolePort, BSPBaseBaud, CHR_8_BITS, 0, 0, 0);
</font><font color='#000088'>+ /* BSPCmdBaud-8-N-1 */
+ BSP_uart_init(BSPConsolePort, BSPCmdBaud, CHR_8_BITS, 0, 0, 0);
</font>
/* Set interrupt handler */
if(BSPConsolePort == BSP_UART_COM1)
<font color='#997700'>@@ -321,11 +323,11 @@
</font>
if(BSPConsolePort == BSP_UART_COM1)
{
<font color='#880000'>- printk("Initialized console on port COM1 %d-8-N-1\n\n", BSPBaseBaud);
</font><font color='#000088'>+ printk("Initialized console on port COM1 %d-8-N-1\n\n", BSPCmdBaud);
</font> }
else
{
<font color='#880000'>- printk("Initialized console on port COM2 %d-8-N-1\n\n", BSPBaseBaud);
</font><font color='#000088'>+ printk("Initialized console on port COM2 %d-8-N-1\n\n", BSPCmdBaud);
</font> }
}
<font color='#997700'>@@ -545,7 +547,7 @@
</font> }
BSP_uart_set_attributes(BSPConsolePort, baud, databits, parity, stopbits);
<font color='#880000'>-
</font><font color='#000088'>+<span style="background-color: #FF0000"> </span>
</font> return 0;
}
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>