RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2009-02-17 Till Straumann <strauman@slac.stanford.edu>

Browse Source 
PR 1370/bsps
	* console/console.c: mvme167 console driver BSP_output_char fails to
	convert \n -> \n\r
This commit is contained in:
Joel Sherrill
2009-02-17 18:32:33 +00:00
parent e399e9d607
commit 2235066781
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/m68k/mvme167/ChangeLog
View File

@@ -1,3 +1,9 @@
2009-02-17 Till Straumann <strauman@slac.stanford.edu>
PR 1370/bsps
* console/console.c: mvme167 console driver BSP_output_char fails to
convert \n -> \n\r
2008-12-04 Joel Sherrill <joel.sherrill@oarcorp.com> 2008-12-04 Joel Sherrill <joel.sherrill@oarcorp.com>
* bsp_specs: Move -e start from *link to *startfile to avoid warning * bsp_specs: Move -e start from *link to *startfile to avoid warning

15
c/src/lib/libbsp/m68k/mvme167/console/console.c
View File

@@ -161,6 +161,15 @@ int _167Bug_pollWrite( int minor, const char *buf, int len );
static void _BSP_output_char( char c ); static void _BSP_output_char( char c );
BSP_output_char_function_type BSP_output_char = _BSP_output_char; BSP_output_char_function_type BSP_output_char = _BSP_output_char;
/* '\r' character in memory. This used to live on
* the stack but storing the '\r' character is
* optimized away by gcc-4.3.2 (since it seems to
* be unused [only referenced from inline assembly
* code in _167Bug_pollWrite()]).
* Hence we make it a global constant.
*/
static const char cr_char = '\r';
/* Channel info */ /* Channel info */
/* static */ volatile struct { /* static */ volatile struct {
void *tty; /* Really a struct rtems_termios_tty * */ void *tty; /* Really a struct rtems_termios_tty * */
@@ -1366,12 +1375,11 @@ rtems_status_code do_poll_write(
{ {
rtems_libio_rw_args_t *rw_args = arg; rtems_libio_rw_args_t *rw_args = arg;
uint32_t i; uint32_t i;
char cr ='\r';
for( i = 0; i < rw_args->count; i++ ) { for( i = 0; i < rw_args->count; i++ ) {
_167Bug_pollWrite(minor, &(rw_args->buffer[i]), 1); _167Bug_pollWrite(minor, &(rw_args->buffer[i]), 1);
if ( rw_args->buffer[i] == '\n' ) if ( rw_args->buffer[i] == '\n' )
_167Bug_pollWrite(minor, &cr, 1); _167Bug_pollWrite(minor, &cr_char, 1);
} }
rw_args->bytes_moved = i; rw_args->bytes_moved = i;
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
@@ -1385,7 +1393,6 @@ rtems_status_code do_poll_write(
void _BSP_output_char(char c) void _BSP_output_char(char c)
{ {
rtems_device_minor_number printk_minor; rtems_device_minor_number printk_minor;
char cr ='\r';
/* /*
* Can't rely on console_initialize having been called before this function * Can't rely on console_initialize having been called before this function
@@ -1399,7 +1406,7 @@ void _BSP_output_char(char c)
_167Bug_pollWrite(printk_minor, &c, 1); _167Bug_pollWrite(printk_minor, &c, 1);
if ( c == '\n' ) if ( c == '\n' )
_167Bug_pollWrite(printk_minor, &cr, 1); _167Bug_pollWrite(printk_minor, &cr_char, 1);
} }
/* /*