diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2005-11-03 19:14:54 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2005-11-03 19:14:54 +0000 |
| commit | e156c6336a0945088385b04ac4598c42cf306c90 (patch) | |
| tree | e7b3a7e417dd907935b10a7ca4f7175622023c82 | |
| parent | 2005-11-03 straumanatslacdotstanford.edu (diff) | |
| download | rtems-e156c6336a0945088385b04ac4598c42cf306c90.tar.bz2 | |
2005-11-03 straumanatslacdotstanforddotedu
* shared/bootloader/misc.c, shared/console/polled_io.c,
shared/residual/residual.c: silenced compiler warnings (type cast &
renaming puts->my_puts)
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/misc.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/console/polled_io.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/residual/residual.c | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index fd7a3b35fb..6e9e30f60c 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2005-11-03 straumanatslacdotstanforddotedu + + * shared/bootloader/misc.c, shared/console/polled_io.c, + shared/residual/residual.c: silenced compiler warnings (type cast & + renaming puts->my_puts) + 2005-11-02 straumanatslacdotstanford.edu * mvme5500/start/start.S, shared/start/start.S, diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c index c4531672df..6f5e0d9e62 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c @@ -424,10 +424,10 @@ setup_hw(void) /* Functions to deal with the residual data */ static int same_DevID(unsigned short vendor, unsigned short Number, - char * str) + unsigned char * str) { static unsigned const char hexdigit[]="0123456789ABCDEF"; - if (strlen(str)!=7) return 0; + if (strlen((char*)str)!=7) return 0; if ( ( ((vendor>>10)&0x1f)+'A'-1 == str[0]) && ( ((vendor>>5)&0x1f)+'A'-1 == str[1]) && ( (vendor&0x1f)+'A'-1 == str[2]) && diff --git a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c index ec28d3ae6d..cbdc40d1ac 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c +++ b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c @@ -524,7 +524,7 @@ void log_putc(const u_char c) { * at the end. So it is made private to avoid confusion in other files. */ static -void puts(const u_char *s) +void my_puts(const u_char *s) { char c; @@ -543,7 +543,7 @@ void flush_log(void) { #endif } for(p=console_global_data.log; p; p=next) { - puts(p->data); + my_puts(p->data); next = p->next; pfree(p); } @@ -900,7 +900,7 @@ int printk(const char *fmt, ...) { va_start(args, fmt); i = k_vsprintf(buf, fmt, args); va_end(args); - puts(buf); + my_puts((u_char*)buf); return i; } diff --git a/c/src/lib/libbsp/powerpc/shared/residual/residual.c b/c/src/lib/libbsp/powerpc/shared/residual/residual.c index 4d5ce41640..d8b308229b 100644 --- a/c/src/lib/libbsp/powerpc/shared/residual/residual.c +++ b/c/src/lib/libbsp/powerpc/shared/residual/residual.c @@ -21,10 +21,10 @@ static int same_DevID(unsigned short vendor, unsigned short Number, - char * str) + unsigned char * str) { static unsigned const char hexdigit[]="0123456789ABCDEF"; - if (strlen(str)!=7) return 0; + if (strlen((char*)str)!=7) return 0; if ( ( ((vendor>>10)&0x1f)+'A'-1 == str[0]) && ( ((vendor>>5)&0x1f)+'A'-1 == str[1]) && ( (vendor&0x1f)+'A'-1 == str[2]) && |