deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed compiler warnings for the AVR platforms

Browse source
This commit is contained in:
Adam Dunkels 2015-10-05 12:46:12 +02:00 committed by Simon Duquennoy
parent 2773a37857
commit d48cf89e9b
5 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/avr/bootloader.c
View file

@ -12,7 +12,7 @@
/* MCUSR is a deprecated name but older avr-libc versions may define it */ /* MCUSR is a deprecated name but older avr-libc versions may define it */
#if !defined (MCUCSR) #if !defined (MCUCSR)
# if defined (MCUSR) # if defined (MCUSR)
# warning *** MCUCSR not defined, using MCUSR instead *** /*# warning *** MCUCSR not defined, using MCUSR instead ****/
# define MCUCSR MCUSR # define MCUCSR MCUSR
# endif # endif
#endif #endif

2
cpu/avr/radio/rf230bb/rf230bb.c
View file

@ -237,6 +237,8 @@ typedef enum{
PROCESS(rf230_process, "RF230 driver"); PROCESS(rf230_process, "RF230 driver");
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int rf230_interrupt(void);
static int rf230_on(void); static int rf230_on(void);
static int rf230_off(void); static int rf230_off(void);

2
cpu/avr/watchdog.c
View file

@ -67,7 +67,7 @@
/* MCUSR is a deprecated name but older avr-libc versions may define it */ /* MCUSR is a deprecated name but older avr-libc versions may define it */
#if !defined (MCUCSR) #if !defined (MCUCSR)
# if defined (MCUSR) # if defined (MCUSR)
# warning *** MCUCSR not defined, using MCUSR instead *** /*# warning *** MCUCSR not defined, using MCUSR instead ****/
# define MCUCSR MCUSR # define MCUCSR MCUSR
# endif # endif
#endif #endif

1
platform/avr-raven/contiki-raven-main.c
View file

@ -527,6 +527,7 @@ extern uip_ds6_netif_t uip_ds6_if;
PRINTF("\n"); PRINTF("\n");
} }
} }
j = 1;
PRINTF("\nNeighbors [%u max]\n",NBR_TABLE_MAX_NEIGHBORS); PRINTF("\nNeighbors [%u max]\n",NBR_TABLE_MAX_NEIGHBORS);
for(nbr = nbr_table_head(ds6_neighbors); for(nbr = nbr_table_head(ds6_neighbors);
nbr != NULL; nbr != NULL;

1
platform/micaz/node-id.c
View file

@ -33,6 +33,7 @@
#include "contiki-conf.h" #include "contiki-conf.h"
#include "sys/node-id.h" #include "sys/node-id.h"
#include "dev/eeprom.h"
unsigned short node_id = 0; unsigned short node_id = 0;