change log for rtems (2011-11-06)
rtems-vc at rtems.org
rtems-vc at rtems.org
Sun Nov 6 21:10:32 UTC 2011
*gedare*:
2011-11-06 Gedare Bloom <gedare at rtems.org>
* shared/console/conscfg.c: Whitespace and style fixes.
M 1.15 c/src/lib/libbsp/sparc64/ChangeLog
M 1.6 c/src/lib/libbsp/sparc64/shared/console/conscfg.c
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
@@ -1,5 +1,9 @@
2011-11-06 Gedare Bloom <gedare at rtems.org>
+ * shared/console/conscfg.c: Whitespace and style fixes.
+
+2011-11-06 Gedare Bloom <gedare at rtems.org>
+
* shared/console/conscfg.c: Give console port a name.
2011-10-18 Jennifer Averett <Jennifer.Averett at OARcorp.com>
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
@@ -8,7 +8,6 @@
* $Id$
*/
-
#include <bsp.h>
#include <libchip/serial.h>
@@ -18,79 +17,75 @@
int sun4v_console_device_first_open(int major, int minor, void *arg)
{
- return 0;
+ return 0;
}
static ssize_t sun4v_console_poll_write(int minor, const char *buf, size_t n)
{
- ofw_write(buf, n);
- return 0;
+ ofw_write(buf, n);
+ return 0;
}
void sun4v_console_deviceInitialize (int minor)
{
-
+
}
int sun4v_console_poll_read(int minor){
- int a;
- ofw_read(&a,1);
- if(a!=0){
- return a>>24;
- }
- return -1;
+ int a;
+ ofw_read(&a,1);
+ if(a!=0){
+ return a>>24;
+ }
+ return -1;
}
-
bool sun4v_console_deviceProbe (int minor){
- return true;
+ return true;
}
/*
* Polled mode functions
*/
console_fns pooled_functions={
- 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;*/
+ 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 */
};
-console_flow sun4v_console_console_flow={
- NULL,/*int (*deviceStopRemoteTx)(int minor);*/
- NULL/*int (*deviceStartRemoteTx)(int minor);*/
+console_flow sun4v_console_console_flow = {
+ NULL, /* deviceStopRemoteTx */
+ NULL /* deviceStartRemoteTx */
};
-
console_tbl Console_Configuration_Ports[] = {
-{
- "/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, /* 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 */
-},
+ {
+ "/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 */
+ },
};
-
-
/*
* Declare some information used by the console driver
*/
@@ -99,7 +94,6 @@
unsigned long Console_Configuration_Count = NUM_CONSOLE_PORTS;
-
/* putchar/getchar for printk */
static void bsp_out_char (char c)
@@ -110,12 +104,12 @@
BSP_output_char_function_type BSP_output_char = bsp_out_char;
static int bsp_in_char( void ){
- int tmp;
- ofw_read( &tmp, 1 ); /* blocks */
- if( tmp != 0 ) {
- return tmp>>24;
- }
- return -1;
+ int tmp;
+ ofw_read( &tmp, 1 ); /* blocks */
+ if( tmp != 0 ) {
+ return tmp>>24;
+ }
+ return -1;
}
BSP_polling_getchar_function_type BSP_poll_char = bsp_in_char;
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20111106/2e8ee473/attachment-0001.html>
More information about the vc
mailing list