From 8c742bc9c815f873097a8468ed3b591730681dc8 Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Mon, 1 Mar 2010 22:07:43 -0500 Subject: [PATCH] add -Werror back it and fix all the errors. --- config.mk | 2 +- libmc1322x/include/put.h | 4 +-- libmc1322x/maca.c | 60 ++++++++++++++++++++-------------------- libmc1322x/printf.c | 4 +-- libmc1322x/put.c | 10 +++---- tests/printf.c | 4 ++- tests/rftest-rx.c | 36 ++++++++++++------------ tests/rftest-tx.c | 32 ++++++++++----------- tests/tests.c | 38 ++++++++++++------------- 9 files changed, 95 insertions(+), 95 deletions(-) diff --git a/config.mk b/config.mk index e44d35fcf..43e232af1 100644 --- a/config.mk +++ b/config.mk @@ -32,7 +32,7 @@ CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS) \ -fno-builtin -ffreestanding -isystem \ $(gccincdir) -pipe $(PLATFORM_CPPFLAGS) -CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wcast-align -Wextra #-Werror +CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wcast-align -Wextra -Werror AFLAGS_DEBUG := -Wa,-gstabs AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS) diff --git a/libmc1322x/include/put.h b/libmc1322x/include/put.h index 034b636ca..f8826f622 100644 --- a/libmc1322x/include/put.h +++ b/libmc1322x/include/put.h @@ -1,8 +1,8 @@ #ifndef PUT_H #define PUT_H -void putc(char c); -void puts(char *s); +void putchr(char c); +void putstr(char *s); void put_hex(uint8_t x); void put_hex16(uint16_t x); void put_hex32(uint32_t x); diff --git a/libmc1322x/maca.c b/libmc1322x/maca.c index 1d9e0645a..4c151eaa6 100644 --- a/libmc1322x/maca.c +++ b/libmc1322x/maca.c @@ -235,7 +235,7 @@ void radio_init(void) { *(volatile uint32_t *)(addr_reg_rep[i]) = data_reg_rep[i]; } - puts("initfromflash\n\r"); + putstr("initfromflash\n\r"); *(volatile uint32_t *)(0x80003048) = 0x00000f04; /* bypass the buck */ for(i=0; i<0x161a8; i++) { continue; } /* wait for the bypass to take */ @@ -245,23 +245,23 @@ void radio_init(void) { init_from_flash(0x1F000); - puts("ram_values:\n\r"); + putstr("ram_values:\n\r"); for(i=0; i<4; i++) { - puts(" 0x"); + putstr(" 0x"); put_hex(ram_values[i]); - puts("\n\r"); + putstr("\n\r"); } - puts("radio_init: ctov parameter 0x"); + putstr("radio_init: ctov parameter 0x"); put_hex(ram_values[3]); - puts("\n\r"); + putstr("\n\r"); for(i=0; i<16; i++) { ctov[i] = get_ctov(i,ram_values[3]); - puts("radio_init: ctov["); + putstr("radio_init: ctov["); put_hex(i); - puts("] = 0x"); + putstr("] = 0x"); put_hex(ctov[i]); - puts("\n\r"); + putstr("\n\r"); } @@ -420,49 +420,49 @@ uint32_t exec_init_entry(volatile uint32_t *entries, uint8_t *valbuf) if(entries[0] <= ROM_END) { if (entries[0] == 0) { /* do delay command*/ - puts("init_entry: delay "); + putstr("init_entry: delay "); put_hex32(entries[1]); - puts("\n\r"); + putstr("\n\r"); for(i=0; i= 16) && (entries[0] < 0xfff1)) { /* store bytes in valbuf */ - puts("init_entry: store in valbuf "); + putstr("init_entry: store in valbuf "); put_hex(entries[1]); - puts(" position "); + putstr(" position "); put_hex((entries[0]>>4)-1); - puts("\n\r"); + putstr("\n\r"); valbuf[(entries[0]>>4)-1] = entries[1]; return 2; } else if (entries[0] == ENTRY_EOF) { - puts("init_entry: eof "); + putstr("init_entry: eof "); return 0; } else { /* invalid command code */ - puts("init_entry: invaild code "); + putstr("init_entry: invaild code "); put_hex32(entries[0]); - puts("\n\r"); + putstr("\n\r"); return 0; } } else { /* address isn't in ROM space */ /* do store value in address command */ - puts("init_entry: address value pair - *0x"); + putstr("init_entry: address value pair - *0x"); put_hex32(entries[0]); - puts(" = "); + putstr(" = "); put_hex32(entries[1]); - puts("\n\r"); + putstr("\n\r"); reg(entries[0]) = entries[1]; return 2; } @@ -478,22 +478,22 @@ uint32_t init_from_flash(uint32_t addr) { volatile uint32_t i=0,j; err = nvm_detect(gNvmInternalInterface_c, &type); - puts("nvm_detect returned type "); + putstr("nvm_detect returned type "); put_hex32(type); - puts(" err "); + putstr(" err "); put_hex(err); - puts("\n\r"); + putstr("\n\r"); nvm_setsvar(0); err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, addr, 8); i+=8; - puts("nvm_read returned: 0x"); + putstr("nvm_read returned: 0x"); put_hex(err); - puts("\n\r"); + putstr("\n\r"); for(j=0; j<4; j++) { put_hex32(buf[j]); - puts("\n\r"); + putstr("\n\r"); } if(buf[0] == FLASH_INIT_MAGIC) { diff --git a/libmc1322x/printf.c b/libmc1322x/printf.c index d2c5f727c..74b388fb2 100644 --- a/libmc1322x/printf.c +++ b/libmc1322x/printf.c @@ -37,7 +37,7 @@ #include #include -#define __putc(x) putc(x) +#define __putc(x) putchr(x) /** * Structure to hold data to be passed to print function with format. @@ -359,8 +359,6 @@ int sprintf( char *out, const char *format, ... ) } */ -static uint8_t ll; - int printf( const char *format, ... ) { int retval = 0; diff --git a/libmc1322x/put.c b/libmc1322x/put.c index 34e336586..348da13f0 100644 --- a/libmc1322x/put.c +++ b/libmc1322x/put.c @@ -4,21 +4,21 @@ const uint8_t hex[16]={'0','1','2','3','4','5','6','7', '8','9','a','b','c','d','e','f'}; -void putc(char c) { +void putchr(char c) { while(*UT1CON == 31); /* wait for there to be room in the buffer */ *UART1_DATA = c; } -void puts(char *s) { +void putstr(char *s) { while(s && *s!=0) { - putc(*s++); + putchr(*s++); } } void put_hex(uint8_t x) { - putc(hex[x >> 4]); - putc(hex[x & 15]); + putchr(hex[x >> 4]); + putchr(hex[x & 15]); } void put_hex16(uint16_t x) diff --git a/tests/printf.c b/tests/printf.c index 66630f5cb..937e6f72e 100644 --- a/tests/printf.c +++ b/tests/printf.c @@ -1,6 +1,8 @@ #include #include +#include + #include "tests.h" #include "config.h" @@ -11,7 +13,7 @@ int main(void) int i = 5; unsigned int bs = sizeof(int)*8; int mi; - char buf[80]; +// char buf[80]; uart_init(INC, MOD); diff --git a/tests/rftest-rx.c b/tests/rftest-rx.c index b0af7a7bc..d2d0a9a53 100644 --- a/tests/rftest-rx.c +++ b/tests/rftest-rx.c @@ -76,65 +76,65 @@ void main(void) { { case(cc_aborted): { - puts("aborted\n\r"); + putstr("aborted\n\r"); ResumeMACASync(); break; } case(cc_not_completed): { - puts("not completed\n\r"); + putstr("not completed\n\r"); ResumeMACASync(); break; } case(cc_timeout): { - puts("timeout\n\r"); + putstr("timeout\n\r"); ResumeMACASync(); break; } case(cc_no_ack): { - puts("no ack\n\r"); + putstr("no ack\n\r"); ResumeMACASync(); break; } case(cc_ext_timeout): { - puts("ext timeout\n\r"); + putstr("ext timeout\n\r"); ResumeMACASync(); break; } case(cc_ext_pnd_timeout): { - puts("ext pnd timeout\n\r"); + putstr("ext pnd timeout\n\r"); ResumeMACASync(); break; } case(cc_success): { -// puts("success\n\r"); +// putstr("success\n\r"); - puts("rftest-rx --- " ); - puts(" maca_getrxlvl: 0x"); + putstr("rftest-rx --- " ); + putstr(" maca_getrxlvl: 0x"); put_hex(*MACA_GETRXLVL); - puts(" timestamp: 0x"); + putstr(" timestamp: 0x"); put_hex32(maca_timestamp); - puts("\n\r"); - puts(" data: 0x"); + putstr("\n\r"); + putstr(" data: 0x"); put_hex32((uint32_t)data); - putc(' '); + putchr(' '); for(i=0; i<=(*MACA_GETRXLVL-4); i++) { /* fcs+somethingelse is not transferred by DMA */ put_hex(data[i]); - putc(' '); + putchr(' '); } - puts("\n\r"); + putstr("\n\r"); toggle_led(); @@ -147,7 +147,7 @@ void main(void) { } default: { - puts("status: "); + putstr("status: "); put_hex16(status); ResumeMACASync(); command_xcvr_rx(); @@ -155,11 +155,11 @@ void main(void) { } } } else if (_is_filter_failed_interrupt(maca_irq)) { - puts("filter failed\n\r"); + putstr("filter failed\n\r"); ResumeMACASync(); command_xcvr_rx(); } else if (_is_checksum_failed_interrupt(maca_irq)) { - puts("crc failed\n\r"); + putstr("crc failed\n\r"); ResumeMACASync(); command_xcvr_rx(); } diff --git a/tests/rftest-tx.c b/tests/rftest-tx.c index dad7c3c09..27a7063a5 100644 --- a/tests/rftest-tx.c +++ b/tests/rftest-tx.c @@ -100,62 +100,62 @@ void main(void) { { case(cc_aborted): { - puts("aborted\n\r"); + putstr("aborted\n\r"); ResumeMACASync(); break; } case(cc_not_completed): { - puts("not completed\n\r"); + putstr("not completed\n\r"); ResumeMACASync(); break; } case(cc_timeout): { - puts("timeout\n\r"); + putstr("timeout\n\r"); ResumeMACASync(); break; } case(cc_no_ack): { - puts("no ack\n\r"); + putstr("no ack\n\r"); ResumeMACASync(); break; } case(cc_ext_timeout): { - puts("ext timeout\n\r"); + putstr("ext timeout\n\r"); ResumeMACASync(); break; } case(cc_ext_pnd_timeout): { - puts("ext pnd timeout\n\r"); + putstr("ext pnd timeout\n\r"); ResumeMACASync(); break; } case(cc_success): { -// puts("success\n\r"); +// putstr("success\n\r"); - puts("rftest-tx --- " ); - puts(" payload len+crc: 0x"); + putstr("rftest-tx --- " ); + putstr(" payload len+crc: 0x"); put_hex(PAYLOAD_LEN+4); - puts(" timestamp: 0x"); + putstr(" timestamp: 0x"); put_hex32(maca_timestamp); - puts("\n\r"); - puts(" data: "); + putstr("\n\r"); + putstr(" data: "); for(i=0; i