Patch rtems-rc-20000702-1.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

that is a hack to workaround a switch generation compiler bug for the
SH2 and cleaned up some warnings.
This commit is contained in:
Joel Sherrill
2000-07-03 15:20:57 +00:00
parent 3af082818e
commit c0ffdeeb60
2 changed files with 30 additions and 14 deletions

View File

@@ -236,11 +236,15 @@ void print_c_lflag( struct termios * tp )
void print_c_cflag( struct termios * tp ) void print_c_cflag( struct termios * tp )
{ {
int baud; unsigned int baud;
printf( "c_cflag = 0x%08x\n", tp->c_cflag ); printf( "c_cflag = 0x%08x\n", tp->c_cflag );
switch( baud = (tp->c_cflag & CBAUD) ) { baud = (tp->c_cflag & CBAUD) ;
#if defined(__sh2__)
if ( tp->c_cflag & CBAUDEX )
#endif
switch( baud ) {
case B0: case B0:
printf( "\tCBAUD =\tB0\n" ); printf( "\tCBAUD =\tB0\n" );
break; break;
@@ -304,7 +308,12 @@ void print_c_cflag( struct termios * tp )
case B38400: case B38400:
printf( "\tCBAUD =\tB38400\n" ); printf( "\tCBAUD =\tB38400\n" );
break; break;
#if defined(__sh2__)
}
else
switch ( baud )
{
#endif
case B57600: case B57600:
printf( "\tCBAUD =\tB57600\n" ); printf( "\tCBAUD =\tB57600\n" );
break; break;
@@ -588,8 +597,7 @@ void change_line_settings( struct termios *tp )
void canonical_input( struct termios *tp ) void canonical_input( struct termios *tp )
{ {
char buffer[256]; char c, first_time = TRUE;
char c, first_time = TRUE;
printf( "\nTesting canonical input\n\n" ); printf( "\nTesting canonical input\n\n" );
@@ -710,7 +718,7 @@ void usage( void )
rtems_task rtems_task
Init (rtems_task_argument ignored) Init (rtems_task_argument ignored)
{ {
char c, done; char c ;
struct termios orig_termios, test_termios; struct termios orig_termios, test_termios;
printf( "\n\n*** TEST OF TERMIOS INPUT CAPABILITIES ***\n" ); printf( "\n\n*** TEST OF TERMIOS INPUT CAPABILITIES ***\n" );

View File

@@ -236,11 +236,15 @@ void print_c_lflag( struct termios * tp )
void print_c_cflag( struct termios * tp ) void print_c_cflag( struct termios * tp )
{ {
int baud; unsigned int baud;
printf( "c_cflag = 0x%08x\n", tp->c_cflag ); printf( "c_cflag = 0x%08x\n", tp->c_cflag );
switch( baud = (tp->c_cflag & CBAUD) ) { baud = (tp->c_cflag & CBAUD) ;
#if defined(__sh2__)
if ( tp->c_cflag & CBAUDEX )
#endif
switch( baud ) {
case B0: case B0:
printf( "\tCBAUD =\tB0\n" ); printf( "\tCBAUD =\tB0\n" );
break; break;
@@ -304,7 +308,12 @@ void print_c_cflag( struct termios * tp )
case B38400: case B38400:
printf( "\tCBAUD =\tB38400\n" ); printf( "\tCBAUD =\tB38400\n" );
break; break;
#if defined(__sh2__)
}
else
switch ( baud )
{
#endif
case B57600: case B57600:
printf( "\tCBAUD =\tB57600\n" ); printf( "\tCBAUD =\tB57600\n" );
break; break;
@@ -588,8 +597,7 @@ void change_line_settings( struct termios *tp )
void canonical_input( struct termios *tp ) void canonical_input( struct termios *tp )
{ {
char buffer[256]; char c, first_time = TRUE;
char c, first_time = TRUE;
printf( "\nTesting canonical input\n\n" ); printf( "\nTesting canonical input\n\n" );
@@ -710,7 +718,7 @@ void usage( void )
rtems_task rtems_task
Init (rtems_task_argument ignored) Init (rtems_task_argument ignored)
{ {
char c, done; char c ;
struct termios orig_termios, test_termios; struct termios orig_termios, test_termios;
printf( "\n\n*** TEST OF TERMIOS INPUT CAPABILITIES ***\n" ); printf( "\n\n*** TEST OF TERMIOS INPUT CAPABILITIES ***\n" );