<!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 (2011-11-06)</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>gedare</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-11-06 Gedare Bloom <gedare@rtems.org>
* shared/console/conscfg.c: Whitespace and style fixes.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/sparc64/ChangeLog.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>c/src/lib/libbsp/sparc64/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/sparc64/shared/console/conscfg.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>c/src/lib/libbsp/sparc64/shared/console/conscfg.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/sparc64/ChangeLog:1.14 rtems/c/src/lib/libbsp/sparc64/ChangeLog:1.15
--- rtems/c/src/lib/libbsp/sparc64/ChangeLog:1.14 Sun Nov 6 14:01:01 2011
+++ rtems/c/src/lib/libbsp/sparc64/ChangeLog Sun Nov 6 14:12:19 2011
</font><font color='#997700'>@@ -1,5 +1,9 @@
</font> 2011-11-06 Gedare Bloom <gedare@rtems.org>
<font color='#000088'>+ * shared/console/conscfg.c: Whitespace and style fixes.
+
+2011-11-06 Gedare Bloom <gedare@rtems.org>
+
</font> * shared/console/conscfg.c: Give console port a name.
2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/sparc64/shared/console/conscfg.c:1.5 rtems/c/src/lib/libbsp/sparc64/shared/console/conscfg.c:1.6
--- rtems/c/src/lib/libbsp/sparc64/shared/console/conscfg.c:1.5 Sun Nov 6 14:01:01 2011
+++ rtems/c/src/lib/libbsp/sparc64/shared/console/conscfg.c Sun Nov 6 14:12:20 2011
</font><font color='#997700'>@@ -8,7 +8,6 @@
</font> * $Id$
*/
<font color='#880000'>-
</font> #include <bsp.h>
#include <libchip/serial.h>
<font color='#997700'>@@ -18,79 +17,75 @@
</font>
int sun4v_console_device_first_open(int major, int minor, void *arg)
{
<font color='#880000'>- return 0;
</font><font color='#000088'>+ return 0;
</font> }
static ssize_t sun4v_console_poll_write(int minor, const char *buf, size_t n)
{
<font color='#880000'>- ofw_write(buf, n);
- return 0;
</font><font color='#000088'>+ ofw_write(buf, n);
+ return 0;
</font> }
void sun4v_console_deviceInitialize (int minor)
{
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+<span style="background-color: #FF0000"> </span>
</font> }
int sun4v_console_poll_read(int minor){
<font color='#880000'>- int a;
- ofw_read(&a,1);
- if(a!=0){
- return a>>24;
- }
- return -1;
</font><font color='#000088'>+ int a;
+ ofw_read(&a,1);
+ if(a!=0){
+ return a>>24;
+ }
+ return -1;
</font> }
<font color='#880000'>-
</font> bool sun4v_console_deviceProbe (int minor){
<font color='#880000'>- return true;
</font><font color='#000088'>+ return true;
</font> }
/*
* Polled mode functions
*/
console_fns pooled_functions={
<font color='#880000'>- sun4v_console_deviceProbe, /*bool (*deviceProbe)(int minor);*/
- sun4v_console_device_first_open, /*int (*deviceFirstOpen)(int major, int minor, void *arg);*/
- NULL, /*int (*deviceLastClose)(int major, int minor, void *arg);*/
- sun4v_console_poll_read, /*int (*deviceRead)(int minor);*/
- sun4v_console_poll_write, /*ssize_t (*deviceWrite)(int minor, const char *buf, size_t len);*/
- sun4v_console_deviceInitialize, /*void (*deviceInitialize)(int minor);*/
- NULL, /*void (*deviceWritePolled)(int minor, char cChar);*/
- NULL, /*int (*deviceSetAttributes)(int minor, const struct termios *t);*/
- NULL /*bool deviceOutputUsesInterrupts;*/
</font><font color='#000088'>+ sun4v_console_deviceProbe, /* deviceProbe */
+ sun4v_console_device_first_open, /* deviceFirstOpen */
+ NULL, /* deviceLastClose */
+ sun4v_console_poll_read, /* deviceRead */
+ sun4v_console_poll_write, /* deviceWrite */
+ sun4v_console_deviceInitialize, /* deviceInitialize */
+ NULL, /* deviceWritePolled */
+ NULL, /* deviceSetAttributes */
+ NULL /* deviceOutputUsesInterrupts */
</font> };
<font color='#880000'>-console_flow sun4v_console_console_flow={
- NULL,/*int (*deviceStopRemoteTx)(int minor);*/
- NULL/*int (*deviceStartRemoteTx)(int minor);*/
</font><font color='#000088'>+console_flow sun4v_console_console_flow = {
+ NULL, /* deviceStopRemoteTx */
+ NULL /* deviceStartRemoteTx */
</font> };
<font color='#880000'>-
</font> console_tbl Console_Configuration_Ports[] = {
<font color='#880000'>-{
- "/dev/ttyS0", /* sDeviceName */
- SERIAL_CUSTOM,<span style="background-color: #FF0000"> </span> /* deviceType */
- &pooled_functions, /* pDeviceFns */
- NULL,<span style="background-color: #FF0000"> </span> /* deviceProbe, assume it is there */
- &sun4v_console_console_flow, /* pDeviceFlow */
- 0, /* ulMargin */
- 0, /* ulHysteresis */
- (void *) NULL, /* NULL */ /* pDeviceParams */
- 0,<span style="background-color: #FF0000"> </span> /* ulCtrlPort1 */
- 0,<span style="background-color: #FF0000"> </span> /* ulCtrlPort2 */
- 1,<span style="background-color: #FF0000"> </span> /* ulDataPort */
- NULL, /* getRegister */
- NULL, /* setRegister */
- NULL, /* unused */ /* getData */
- NULL, /* unused */ /* setData */
- 0,<span style="background-color: #FF0000"> </span> /* ulClock */
- 0<span style="background-color: #FF0000"> </span> /* ulIntVector -- base for port */
-},
</font><font color='#000088'>+ {
+ "/dev/ttyS0", /* sDeviceName */
+ SERIAL_CUSTOM, /* deviceType */
+ &pooled_functions, /* pDeviceFns */
+ NULL, /* deviceProbe, assume it is there */
+ &sun4v_console_console_flow, /* pDeviceFlow */
+ 0, /* ulMargin */
+ 0, /* ulHysteresis */
+ (void *) NULL, /* pDeviceParams */
+ 0, /* ulCtrlPort1 */
+ 0, /* ulCtrlPort2 */
+ 1, /* ulDataPort */
+ NULL, /* getRegister */
+ NULL, /* setRegister */
+ NULL, /* unused */ /* getData */
+ NULL, /* unused */ /* setData */
+ 0, /* ulClock */
+ 0 /* ulIntVector -- base for port */
+ },
</font> };
<font color='#880000'>-
-
</font> /*
* Declare some information used by the console driver
*/
<font color='#997700'>@@ -99,7 +94,6 @@
</font>
unsigned long Console_Configuration_Count = NUM_CONSOLE_PORTS;
<font color='#880000'>-
</font> /* putchar/getchar for printk */
static void bsp_out_char (char c)
<font color='#997700'>@@ -110,12 +104,12 @@
</font> BSP_output_char_function_type BSP_output_char = bsp_out_char;
static int bsp_in_char( void ){
<font color='#880000'>- int tmp;
- ofw_read( &tmp, 1 ); /* blocks */
- if( tmp != 0 ) {
- return tmp>>24;
- }
- return -1;
</font><font color='#000088'>+ int tmp;
+ ofw_read( &tmp, 1 ); /* blocks */
+ if( tmp != 0 ) {
+ return tmp>>24;
+ }
+ return -1;
</font> }
BSP_polling_getchar_function_type BSP_poll_char = bsp_in_char;
</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>