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

Avoid newlines in macro expansions as cc65 doesn't support them between the macro name and the open parenthesis of the arguments.

Browse source 
There were btw other even longer lines with expansions of the same macro already present.
This commit is contained in:
oliverschmidt 2010-03-14 12:13:54 +00:00
parent e8bd53cfd8
commit def540e6c0
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/net/mac/contikimac.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: contikimac.c,v 1.10 2010/03/09 20:37:02 adamdunkels Exp $ * $Id: contikimac.c,v 1.11 2010/03/14 12:13:54 oliverschmidt Exp $
*/ */
/** /**
@ -682,11 +682,9 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr)
that the other side needs some time to produce a reply. */ that the other side needs some time to produce a reply. */
wt = RTIMER_NOW(); wt = RTIMER_NOW();
#if NURTIMER #if NURTIMER
while(RTIMER_CLOCK_LT while(RTIMER_CLOCK_LT(wt, RTIMER_NOW(), wt + INTER_PACKET_INTERVAL));
(wt, RTIMER_NOW(), wt + INTER_PACKET_INTERVAL));
#else #else
while(RTIMER_CLOCK_LT while(RTIMER_CLOCK_LT(RTIMER_NOW(), wt + INTER_PACKET_INTERVAL)) { }
(RTIMER_NOW(), wt + INTER_PACKET_INTERVAL)) { }
#endif #endif
if(!is_broadcast && (NETSTACK_RADIO.receiving_packet() || if(!is_broadcast && (NETSTACK_RADIO.receiving_packet() ||
NETSTACK_RADIO.pending_packet() || NETSTACK_RADIO.pending_packet() ||
@ -694,11 +692,9 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr)
uint8_t ackbuf[ACK_LEN]; uint8_t ackbuf[ACK_LEN];
wt = RTIMER_NOW(); wt = RTIMER_NOW();
#if NURTIMER #if NURTIMER
while(RTIMER_CLOCK_LT while(RTIMER_CLOCK_LT(wt, RTIMER_NOW(), wt + AFTER_ACK_DETECTECT_WAIT_TIME));
(wt, RTIMER_NOW(), wt + AFTER_ACK_DETECTECT_WAIT_TIME));
#else #else
while(RTIMER_CLOCK_LT while(RTIMER_CLOCK_LT(RTIMER_NOW(), wt + AFTER_ACK_DETECTECT_WAIT_TIME)) { }
(RTIMER_NOW(), wt + AFTER_ACK_DETECTECT_WAIT_TIME)) { }
#endif #endif
len = NETSTACK_RADIO.read(ackbuf, ACK_LEN); len = NETSTACK_RADIO.read(ackbuf, ACK_LEN);
if(len == ACK_LEN) { if(len == ACK_LEN) {