Fix compile errors with SDCC
Intermingled declarations and code are not yet implemented in sdcc.
This commit is contained in:
parent
9217c8b321
commit
e6819effef
2 changed files with 15 additions and 8 deletions
|
@ -358,11 +358,14 @@ powercycle_turn_radio_on(void)
|
|||
static char
|
||||
powercycle(struct rtimer *t, void *ptr)
|
||||
{
|
||||
#if SYNC_CYCLE_STARTS
|
||||
static volatile rtimer_clock_t sync_cycle_start;
|
||||
static volatile uint8_t sync_cycle_phase;
|
||||
#endif
|
||||
|
||||
PT_BEGIN(&pt);
|
||||
|
||||
#if SYNC_CYCLE_STARTS
|
||||
static volatile rtimer_clock_t sync_cycle_start;
|
||||
static volatile uint8_t sync_cycle_phase;
|
||||
sync_cycle_start = RTIMER_NOW();
|
||||
#else
|
||||
cycle_start = RTIMER_NOW();
|
||||
|
|
|
@ -145,6 +145,7 @@ create_llao(uint8_t *llao, uint8_t type) {
|
|||
void
|
||||
uip_nd6_ns_input(void)
|
||||
{
|
||||
uint8_t flags;
|
||||
PRINTF("Received NS from ");
|
||||
PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
|
||||
PRINTF(" to ");
|
||||
|
@ -154,8 +155,6 @@ uip_nd6_ns_input(void)
|
|||
PRINTF("\n");
|
||||
UIP_STAT(++uip_stat.nd6.recv);
|
||||
|
||||
uint8_t flags;
|
||||
|
||||
#if UIP_CONF_IPV6_CHECKS
|
||||
if((UIP_IP_BUF->ttl != UIP_ND6_HOP_LIMIT) ||
|
||||
(uip_is_addr_mcast(&UIP_ND6_NS_BUF->tgtipaddr)) ||
|
||||
|
@ -390,6 +389,11 @@ uip_nd6_ns_output(uip_ipaddr_t * src, uip_ipaddr_t * dest, uip_ipaddr_t * tgt)
|
|||
void
|
||||
uip_nd6_na_input(void)
|
||||
{
|
||||
uint8_t is_llchange;
|
||||
uint8_t is_router;
|
||||
uint8_t is_solicited;
|
||||
uint8_t is_override;
|
||||
|
||||
PRINTF("Received NA from");
|
||||
PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
|
||||
PRINTF("to");
|
||||
|
@ -403,11 +407,11 @@ uip_nd6_na_input(void)
|
|||
* booleans. the three last one are not 0 or 1 but 0 or 0x80, 0x40, 0x20
|
||||
* but it works. Be careful though, do not use tests such as is_router == 1
|
||||
*/
|
||||
uint8_t is_llchange = 0;
|
||||
uint8_t is_router = ((UIP_ND6_NA_BUF->flagsreserved & UIP_ND6_NA_FLAG_ROUTER));
|
||||
uint8_t is_solicited =
|
||||
is_llchange = 0;
|
||||
is_router = ((UIP_ND6_NA_BUF->flagsreserved & UIP_ND6_NA_FLAG_ROUTER));
|
||||
is_solicited =
|
||||
((UIP_ND6_NA_BUF->flagsreserved & UIP_ND6_NA_FLAG_SOLICITED));
|
||||
uint8_t is_override =
|
||||
is_override =
|
||||
((UIP_ND6_NA_BUF->flagsreserved & UIP_ND6_NA_FLAG_OVERRIDE));
|
||||
|
||||
#if UIP_CONF_IPV6_CHECKS
|
||||
|
|
Loading…
Reference in a new issue