Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-01-03 11:30:53 +00:00
Code Issues Projects Releases Wiki Activity

add -Werror back it and fix all the errors.

Browse Source
This commit is contained in:
Mariano Alvira 2010-03-01 22:07:43 -05:00
parent ff146c7e9f
commit 8c742bc9c8
9 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.mk
View File

@ -32,7 +32,7 @@ CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS) \
-fno-builtin -ffreestanding -isystem \ -fno-builtin -ffreestanding -isystem \
$(gccincdir) -pipe $(PLATFORM_CPPFLAGS) $(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_DEBUG := -Wa,-gstabs
AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS) AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS)

4
libmc1322x/include/put.h
View File

@ -1,8 +1,8 @@
#ifndef PUT_H #ifndef PUT_H
#define PUT_H #define PUT_H
void putc(char c); void putchr(char c);
void puts(char *s); void putstr(char *s);
void put_hex(uint8_t x); void put_hex(uint8_t x);
void put_hex16(uint16_t x); void put_hex16(uint16_t x);
void put_hex32(uint32_t x); void put_hex32(uint32_t x);

60
libmc1322x/maca.c
View File

@ -235,7 +235,7 @@ void radio_init(void) {
*(volatile uint32_t *)(addr_reg_rep[i]) = data_reg_rep[i]; *(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 */ *(volatile uint32_t *)(0x80003048) = 0x00000f04; /* bypass the buck */
for(i=0; i<0x161a8; i++) { continue; } /* wait for the bypass to take */ 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); init_from_flash(0x1F000);
puts("ram_values:\n\r"); putstr("ram_values:\n\r");
for(i=0; i<4; i++) { for(i=0; i<4; i++) {
puts(" 0x"); putstr(" 0x");
put_hex(ram_values[i]); 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]); put_hex(ram_values[3]);
puts("\n\r"); putstr("\n\r");
for(i=0; i<16; i++) { for(i=0; i<16; i++) {
ctov[i] = get_ctov(i,ram_values[3]); ctov[i] = get_ctov(i,ram_values[3]);
puts("radio_init: ctov["); putstr("radio_init: ctov[");
put_hex(i); put_hex(i);
puts("] = 0x"); putstr("] = 0x");
put_hex(ctov[i]); 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] <= ROM_END) {
if (entries[0] == 0) { if (entries[0] == 0) {
/* do delay command*/ /* do delay command*/
puts("init_entry: delay "); putstr("init_entry: delay ");
put_hex32(entries[1]); put_hex32(entries[1]);
puts("\n\r"); putstr("\n\r");
for(i=0; i<entries[1]; i++) { continue; } for(i=0; i<entries[1]; i++) { continue; }
return 2; return 2;
} else if (entries[0] == 1) { } else if (entries[0] == 1) {
/* do bit set/clear command*/ /* do bit set/clear command*/
puts("init_entry: bit set clear "); putstr("init_entry: bit set clear ");
put_hex32(entries[1]); put_hex32(entries[1]);
putc(' '); putchr(' ');
put_hex32(entries[2]); put_hex32(entries[2]);
putc(' '); putchr(' ');
put_hex32(entries[3]); put_hex32(entries[3]);
puts("\n\r"); putstr("\n\r");
reg(entries[2]) = (reg(entries[2]) & ~entries[1]) | (entries[3] & entries[1]); reg(entries[2]) = (reg(entries[2]) & ~entries[1]) | (entries[3] & entries[1]);
return 4; return 4;
} else if ((entries[0] >= 16) && } else if ((entries[0] >= 16) &&
(entries[0] < 0xfff1)) { (entries[0] < 0xfff1)) {
/* store bytes in valbuf */ /* store bytes in valbuf */
puts("init_entry: store in valbuf "); putstr("init_entry: store in valbuf ");
put_hex(entries[1]); put_hex(entries[1]);
puts(" position "); putstr(" position ");
put_hex((entries[0]>>4)-1); put_hex((entries[0]>>4)-1);
puts("\n\r"); putstr("\n\r");
valbuf[(entries[0]>>4)-1] = entries[1]; valbuf[(entries[0]>>4)-1] = entries[1];
return 2; return 2;
} else if (entries[0] == ENTRY_EOF) { } else if (entries[0] == ENTRY_EOF) {
puts("init_entry: eof "); putstr("init_entry: eof ");
return 0; return 0;
} else { } else {
/* invalid command code */ /* invalid command code */
puts("init_entry: invaild code "); putstr("init_entry: invaild code ");
put_hex32(entries[0]); put_hex32(entries[0]);
puts("\n\r"); putstr("\n\r");
return 0; return 0;
} }
} else { /* address isn't in ROM space */ } else { /* address isn't in ROM space */
/* do store value in address command */ /* do store value in address command */
puts("init_entry: address value pair - *0x"); putstr("init_entry: address value pair - *0x");
put_hex32(entries[0]); put_hex32(entries[0]);
puts(" = "); putstr(" = ");
put_hex32(entries[1]); put_hex32(entries[1]);
puts("\n\r"); putstr("\n\r");
reg(entries[0]) = entries[1]; reg(entries[0]) = entries[1];
return 2; return 2;
} }
@ -478,22 +478,22 @@ uint32_t init_from_flash(uint32_t addr) {
volatile uint32_t i=0,j; volatile uint32_t i=0,j;
err = nvm_detect(gNvmInternalInterface_c, &type); err = nvm_detect(gNvmInternalInterface_c, &type);
puts("nvm_detect returned type "); putstr("nvm_detect returned type ");
put_hex32(type); put_hex32(type);
puts(" err "); putstr(" err ");
put_hex(err); put_hex(err);
puts("\n\r"); putstr("\n\r");
nvm_setsvar(0); nvm_setsvar(0);
err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, addr, 8); err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, addr, 8);
i+=8; i+=8;
puts("nvm_read returned: 0x"); putstr("nvm_read returned: 0x");
put_hex(err); put_hex(err);
puts("\n\r"); putstr("\n\r");
for(j=0; j<4; j++) { for(j=0; j<4; j++) {
put_hex32(buf[j]); put_hex32(buf[j]);
puts("\n\r"); putstr("\n\r");
} }
if(buf[0] == FLASH_INIT_MAGIC) { if(buf[0] == FLASH_INIT_MAGIC) {

4
libmc1322x/printf.c
View File

@ -37,7 +37,7 @@
#include <mc1322x.h> #include <mc1322x.h>
#include <types.h> #include <types.h>
#define __putc(x) putc(x) #define __putc(x) putchr(x)
/** /**
* Structure to hold data to be passed to print function with format. * 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 printf( const char *format, ... )
{ {
int retval = 0; int retval = 0;

10
libmc1322x/put.c
View File

@ -4,21 +4,21 @@
const uint8_t hex[16]={'0','1','2','3','4','5','6','7', const uint8_t hex[16]={'0','1','2','3','4','5','6','7',
'8','9','a','b','c','d','e','f'}; '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 */ while(*UT1CON == 31); /* wait for there to be room in the buffer */
*UART1_DATA = c; *UART1_DATA = c;
} }
void puts(char *s) { void putstr(char *s) {
while(s && *s!=0) { while(s && *s!=0) {
putc(*s++); putchr(*s++);
} }
} }
void put_hex(uint8_t x) void put_hex(uint8_t x)
{ {
putc(hex[x >> 4]); putchr(hex[x >> 4]);
putc(hex[x & 15]); putchr(hex[x & 15]);
} }
void put_hex16(uint16_t x) void put_hex16(uint16_t x)

4
tests/printf.c
View File

@ -1,6 +1,8 @@
#include <mc1322x.h> #include <mc1322x.h>
#include <board.h> #include <board.h>
#include <stdio.h>
#include "tests.h" #include "tests.h"
#include "config.h" #include "config.h"
@ -11,7 +13,7 @@ int main(void)
int i = 5; int i = 5;
unsigned int bs = sizeof(int)*8; unsigned int bs = sizeof(int)*8;
int mi; int mi;
char buf[80]; // char buf[80];
uart_init(INC, MOD); uart_init(INC, MOD);

36
tests/rftest-rx.c
View File

@ -76,65 +76,65 @@ void main(void) {
{ {
case(cc_aborted): case(cc_aborted):
{ {
puts("aborted\n\r"); putstr("aborted\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_not_completed): case(cc_not_completed):
{ {
puts("not completed\n\r"); putstr("not completed\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_timeout): case(cc_timeout):
{ {
puts("timeout\n\r"); putstr("timeout\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_no_ack): case(cc_no_ack):
{ {
puts("no ack\n\r"); putstr("no ack\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_ext_timeout): case(cc_ext_timeout):
{ {
puts("ext timeout\n\r"); putstr("ext timeout\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_ext_pnd_timeout): case(cc_ext_pnd_timeout):
{ {
puts("ext pnd timeout\n\r"); putstr("ext pnd timeout\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_success): case(cc_success):
{ {
// puts("success\n\r"); // putstr("success\n\r");
puts("rftest-rx --- " ); putstr("rftest-rx --- " );
puts(" maca_getrxlvl: 0x"); putstr(" maca_getrxlvl: 0x");
put_hex(*MACA_GETRXLVL); put_hex(*MACA_GETRXLVL);
puts(" timestamp: 0x"); putstr(" timestamp: 0x");
put_hex32(maca_timestamp); put_hex32(maca_timestamp);
puts("\n\r"); putstr("\n\r");
puts(" data: 0x"); putstr(" data: 0x");
put_hex32((uint32_t)data); put_hex32((uint32_t)data);
putc(' '); putchr(' ');
for(i=0; i<=(*MACA_GETRXLVL-4); i++) { /* fcs+somethingelse is not transferred by DMA */ for(i=0; i<=(*MACA_GETRXLVL-4); i++) { /* fcs+somethingelse is not transferred by DMA */
put_hex(data[i]); put_hex(data[i]);
putc(' '); putchr(' ');
} }
puts("\n\r"); putstr("\n\r");
toggle_led(); toggle_led();
@ -147,7 +147,7 @@ void main(void) {
} }
default: default:
{ {
puts("status: "); putstr("status: ");
put_hex16(status); put_hex16(status);
ResumeMACASync(); ResumeMACASync();
command_xcvr_rx(); command_xcvr_rx();
@ -155,11 +155,11 @@ void main(void) {
} }
} }
} else if (_is_filter_failed_interrupt(maca_irq)) { } else if (_is_filter_failed_interrupt(maca_irq)) {
puts("filter failed\n\r"); putstr("filter failed\n\r");
ResumeMACASync(); ResumeMACASync();
command_xcvr_rx(); command_xcvr_rx();
} else if (_is_checksum_failed_interrupt(maca_irq)) { } else if (_is_checksum_failed_interrupt(maca_irq)) {
puts("crc failed\n\r"); putstr("crc failed\n\r");
ResumeMACASync(); ResumeMACASync();
command_xcvr_rx(); command_xcvr_rx();
} }

32
tests/rftest-tx.c
View File

@ -100,62 +100,62 @@ void main(void) {
{ {
case(cc_aborted): case(cc_aborted):
{ {
puts("aborted\n\r"); putstr("aborted\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_not_completed): case(cc_not_completed):
{ {
puts("not completed\n\r"); putstr("not completed\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_timeout): case(cc_timeout):
{ {
puts("timeout\n\r"); putstr("timeout\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_no_ack): case(cc_no_ack):
{ {
puts("no ack\n\r"); putstr("no ack\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_ext_timeout): case(cc_ext_timeout):
{ {
puts("ext timeout\n\r"); putstr("ext timeout\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_ext_pnd_timeout): case(cc_ext_pnd_timeout):
{ {
puts("ext pnd timeout\n\r"); putstr("ext pnd timeout\n\r");
ResumeMACASync(); ResumeMACASync();
break; break;
} }
case(cc_success): case(cc_success):
{ {
// puts("success\n\r"); // putstr("success\n\r");
puts("rftest-tx --- " ); putstr("rftest-tx --- " );
puts(" payload len+crc: 0x"); putstr(" payload len+crc: 0x");
put_hex(PAYLOAD_LEN+4); put_hex(PAYLOAD_LEN+4);
puts(" timestamp: 0x"); putstr(" timestamp: 0x");
put_hex32(maca_timestamp); put_hex32(maca_timestamp);
puts("\n\r"); putstr("\n\r");
puts(" data: "); putstr(" data: ");
for(i=0; i<PAYLOAD_LEN; i++) { for(i=0; i<PAYLOAD_LEN; i++) {
put_hex(data[i]); put_hex(data[i]);
putc(' '); putchr(' ');
} }
puts("\n\r"); putstr("\n\r");
toggle_led(); toggle_led();
@ -167,14 +167,14 @@ void main(void) {
} }
default: default:
{ {
puts("status: "); putstr("status: ");
put_hex16(status); put_hex16(status);
ResumeMACASync(); ResumeMACASync();
} }
} }
} else if (_is_filter_failed_interrupt(maca_irq)) { } else if (_is_filter_failed_interrupt(maca_irq)) {
puts("filter failed\n\r"); putstr("filter failed\n\r");
ResumeMACASync(); ResumeMACASync();
} }

38
tests/tests.c
View File

@ -21,30 +21,30 @@ void uart1_init(uint16_t inc, uint16_t mod) {
} }
void print_welcome(char* testname) { void print_welcome(char* testname) {
puts("mc1322x-test: "); putstr("mc1322x-test: ");
puts(testname); putstr(testname);
puts("\n\r"); putstr("\n\r");
puts("board: "); putstr("board: ");
#if (BOARD == redbee-dev) #if (BOARD == redbee-dev)
puts("redbee-dev"); putstr("redbee-dev");
#elif (BOARD == redbee-r1) #elif (BOARD == redbee-r1)
puts("redbee-dev"); putstr("redbee-dev");
#endif #endif
puts("\n\r"); putstr("\n\r");
} }
void dump_regs(uint32_t base, uint32_t len) { void dump_regs(uint32_t base, uint32_t len) {
volatile uint32_t i; volatile uint32_t i;
puts("base +0 +4 +8 +c +10 +14 +18 +1c \n\r"); putstr("base +0 +4 +8 +c +10 +14 +18 +1c \n\r");
for (i = 0; i < len; i ++) { for (i = 0; i < len; i ++) {
if ((i & 7) == 0) { if ((i & 7) == 0) {
put_hex16(4 * i); put_hex16(4 * i);
} }
puts(" "); putstr(" ");
put_hex32(*mem32(base+(4*i))); put_hex32(*mem32(base+(4*i)));
if ((i & 7) == 7) if ((i & 7) == 7)
puts(NL); putstr(NL);
} }
puts(NL); putstr(NL);
} }