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

Remove compiler warnings

Browse source
This commit is contained in:
dak664 2010-02-15 20:54:37 +00:00
parent bb9afb4fb1
commit 1bdff78e6e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/avr-ravenusb/sicslow_ethernet.c
View file

@ -249,7 +249,7 @@
#if UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS #if UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS
#define rndis_ethernet_addr local_ethernet_addr #define rndis_ethernet_addr local_ethernet_addr
static uint64_t local_ethernet_addr = 0x3A3B3C3D3E3F; static uint64_t local_ethernet_addr = 0x3A3B3C3D3E3FULL;
#else #else
extern uint64_t rndis_ethernet_addr; extern uint64_t rndis_ethernet_addr;
#endif #endif
@ -672,7 +672,6 @@ int8_t mac_translateIcmpLinkLayer(lltype_t target)
*/ */
uint8_t mac_createSicslowpanLongAddr(uint8_t * ethernet, uip_lladdr_t * lowpan) uint8_t mac_createSicslowpanLongAddr(uint8_t * ethernet, uip_lladdr_t * lowpan)
{ {
uint8_t index;
#if UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS #if UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS
@ -688,6 +687,8 @@ uint8_t mac_createSicslowpanLongAddr(uint8_t * ethernet, uip_lladdr_t * lowpan)
#else //!UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS #else //!UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS
uint8_t index;
#if UIP_LLADDR_LEN == 8 #if UIP_LLADDR_LEN == 8
//Special case - if the address is our address, we just copy over what we know to be //Special case - if the address is our address, we just copy over what we know to be
//our 802.15.4 address //our 802.15.4 address
@ -750,8 +751,6 @@ uint8_t mac_createSicslowpanLongAddr(uint8_t * ethernet, uip_lladdr_t * lowpan)
*/ */
uint8_t mac_createEthernetAddr(uint8_t * ethernet, uip_lladdr_t * lowpan) uint8_t mac_createEthernetAddr(uint8_t * ethernet, uip_lladdr_t * lowpan)
{ {
uint8_t index = 0;
uint8_t i;
//uint8_t i,j, match; //uint8_t i,j, match;
@ -767,6 +766,9 @@ uint8_t mac_createEthernetAddr(uint8_t * ethernet, uip_lladdr_t * lowpan)
#else //!UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS #else //!UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS
uint8_t index = 0;
uint8_t i;
#if UIP_LLADDR_LEN == 8 #if UIP_LLADDR_LEN == 8
//Special case - if the address is our address, we just copy over what we know to be //Special case - if the address is our address, we just copy over what we know to be