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)
This commit is contained in:
Till Straumann
2005-11-03 19:14:54 +00:00
parent cc9073d19b
commit e156c6336a
4 changed files with 13 additions and 7 deletions

View File

@@ -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 2005-11-02 straumanatslacdotstanford.edu
* mvme5500/start/start.S, shared/start/start.S, * mvme5500/start/start.S, shared/start/start.S,

View File

@@ -424,10 +424,10 @@ setup_hw(void)
/* Functions to deal with the residual data */ /* Functions to deal with the residual data */
static int same_DevID(unsigned short vendor, static int same_DevID(unsigned short vendor,
unsigned short Number, unsigned short Number,
char * str) unsigned char * str)
{ {
static unsigned const char hexdigit[]="0123456789ABCDEF"; 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]) && if ( ( ((vendor>>10)&0x1f)+'A'-1 == str[0]) &&
( ((vendor>>5)&0x1f)+'A'-1 == str[1]) && ( ((vendor>>5)&0x1f)+'A'-1 == str[1]) &&
( (vendor&0x1f)+'A'-1 == str[2]) && ( (vendor&0x1f)+'A'-1 == str[2]) &&

View File

@@ -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. * at the end. So it is made private to avoid confusion in other files.
*/ */
static static
void puts(const u_char *s) void my_puts(const u_char *s)
{ {
char c; char c;
@@ -543,7 +543,7 @@ void flush_log(void) {
#endif #endif
} }
for(p=console_global_data.log; p; p=next) { for(p=console_global_data.log; p; p=next) {
puts(p->data); my_puts(p->data);
next = p->next; next = p->next;
pfree(p); pfree(p);
} }
@@ -900,7 +900,7 @@ int printk(const char *fmt, ...) {
va_start(args, fmt); va_start(args, fmt);
i = k_vsprintf(buf, fmt, args); i = k_vsprintf(buf, fmt, args);
va_end(args); va_end(args);
puts(buf); my_puts((u_char*)buf);
return i; return i;
} }

View File

@@ -21,10 +21,10 @@
static int same_DevID(unsigned short vendor, static int same_DevID(unsigned short vendor,
unsigned short Number, unsigned short Number,
char * str) unsigned char * str)
{ {
static unsigned const char hexdigit[]="0123456789ABCDEF"; 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]) && if ( ( ((vendor>>10)&0x1f)+'A'-1 == str[0]) &&
( ((vendor>>5)&0x1f)+'A'-1 == str[1]) && ( ((vendor>>5)&0x1f)+'A'-1 == str[1]) &&
( (vendor&0x1f)+'A'-1 == str[2]) && ( (vendor&0x1f)+'A'-1 == str[2]) &&