diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-05-10 14:55:43 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-05-10 14:55:43 +0000 |
commit | 6d8720c48161709d81fc890643308c214f6f8dae (patch) | |
tree | 00f4ee0560e48363932e967ca6b52baf0f82e737 /cpukit | |
parent | 2009-05-10 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-6d8720c48161709d81fc890643308c214f6f8dae.tar.bz2 |
2009-05-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/shell/login_prompt.c, libmisc/shell/shell_script.c,
rtems/include/rtems/rtems/timer.h: Fix warnings.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/libmisc/shell/login_prompt.c | 4 | ||||
-rw-r--r-- | cpukit/libmisc/shell/shell_script.c | 12 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/timer.h | 4 |
4 files changed, 18 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index bdf90fa8b8..7c1fa748b6 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2009-05-10 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libmisc/shell/login_prompt.c, libmisc/shell/shell_script.c, + rtems/include/rtems/rtems/timer.h: Fix warnings. + 2009-05-08 Joel Sherrill <joel.sherrill@oarcorp.com> * posix/include/rtems/posix/psignal.h, diff --git a/cpukit/libmisc/shell/login_prompt.c b/cpukit/libmisc/shell/login_prompt.c index 5701a579c2..0e754f7120 100644 --- a/cpukit/libmisc/shell/login_prompt.c +++ b/cpukit/libmisc/shell/login_prompt.c @@ -167,8 +167,8 @@ bool rtems_shell_login_prompt( if (tcgetattr( fd_in, &termios_previous) == 0) { struct termios termios_new = termios_previous; - termios_new.c_lflag &= ~ECHO; - termios_new.c_lflag &= ~ICANON; + termios_new.c_lflag &= (unsigned char) ~ECHO; + termios_new.c_lflag &= (unsigned char) ~ICANON; termios_new.c_cc [VTIME] = 255; termios_new.c_cc [VMIN] = 0; diff --git a/cpukit/libmisc/shell/shell_script.c b/cpukit/libmisc/shell/shell_script.c index a970720879..34be6cd0ec 100644 --- a/cpukit/libmisc/shell/shell_script.c +++ b/cpukit/libmisc/shell/shell_script.c @@ -4,7 +4,7 @@ * Pseudo-code from Chris Johns, implemented and debugged * by Joel Sherrill. * - * COPYRIGHT (c) 1989-2008. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -100,6 +100,11 @@ static int findOnPATH( int rtems_shell_main_joel( int argc, char **argv +); + +int rtems_shell_main_joel( + int argc, + char **argv ) { int option; @@ -120,10 +125,11 @@ int rtems_shell_main_joel( outputFile = getopt_reent.optarg; break; case 'p': - taskPriority = rtems_shell_str2int(getopt_reent.optarg); + taskPriority = + (rtems_task_priority) rtems_shell_str2int(getopt_reent.optarg); break; case 's': - stackSize = rtems_shell_str2int(getopt_reent.optarg); + stackSize = (uint32_t) rtems_shell_str2int(getopt_reent.optarg); break; case 't': taskName = getopt_reent.optarg; diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/rtems/include/rtems/rtems/timer.h index 357eb1b418..f3d375818f 100644 --- a/cpukit/rtems/include/rtems/rtems/timer.h +++ b/cpukit/rtems/include/rtems/rtems/timer.h @@ -22,7 +22,7 @@ * - cancel a time */ -/* COPYRIGHT (c) 1989-2008. +/* COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -289,7 +289,7 @@ rtems_status_code rtems_timer_initiate_server( * When given this priority, a special high priority not accessible * via the Classic API is used. */ -#define RTEMS_TIMER_SERVER_DEFAULT_PRIORITY -1 +#define RTEMS_TIMER_SERVER_DEFAULT_PRIORITY (uint32_t) -1 /** * This is the structure filled in by the timer get information |