Skip to content

Commit

Permalink
Fixed compiler warnings for the AVR platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdunkels authored and simonduq committed Oct 20, 2015
1 parent 2773a37 commit d48cf89
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cpu/avr/bootloader.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/* MCUSR is a deprecated name but older avr-libc versions may define it */
#if !defined (MCUCSR)
# if defined (MCUSR)
# warning *** MCUCSR not defined, using MCUSR instead ***
/*# warning *** MCUCSR not defined, using MCUSR instead ****/
# define MCUCSR MCUSR
# endif
#endif
Expand Down
2 changes: 2 additions & 0 deletions cpu/avr/radio/rf230bb/rf230bb.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ typedef enum{
PROCESS(rf230_process, "RF230 driver");
/*---------------------------------------------------------------------------*/

int rf230_interrupt(void);

static int rf230_on(void);
static int rf230_off(void);

Expand Down
2 changes: 1 addition & 1 deletion cpu/avr/watchdog.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
/* MCUSR is a deprecated name but older avr-libc versions may define it */
#if !defined (MCUCSR)
# if defined (MCUSR)
# warning *** MCUCSR not defined, using MCUSR instead ***
/*# warning *** MCUCSR not defined, using MCUSR instead ****/
# define MCUCSR MCUSR
# endif
#endif
Expand Down
1 change: 1 addition & 0 deletions platform/avr-raven/contiki-raven-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,7 @@ extern uip_ds6_netif_t uip_ds6_if;
PRINTF("\n");
}
}
j = 1;
PRINTF("\nNeighbors [%u max]\n",NBR_TABLE_MAX_NEIGHBORS);
for(nbr = nbr_table_head(ds6_neighbors);
nbr != NULL;
Expand Down
1 change: 1 addition & 0 deletions platform/micaz/node-id.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

#include "contiki-conf.h"
#include "sys/node-id.h"
#include "dev/eeprom.h"

unsigned short node_id = 0;

Expand Down

0 comments on commit d48cf89

Please sign in to comment.