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

Fixed compilation without timesynch compiled in

Browse source
This commit is contained in:
adamdunkels 2010-02-18 20:56:12 +00:00
parent 6df1e0ca58
commit 6b523f2446
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/shell/shell-netperf.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: shell-netperf.c,v 1.5 2010/02/02 15:29:24 adamdunkels Exp $ * $Id: shell-netperf.c,v 1.6 2010/02/18 20:56:12 adamdunkels Exp $
*/ */
/** /**
@ -287,7 +287,11 @@ construct_next_packet(void)
msg = packetbuf_dataptr(); msg = packetbuf_dataptr();
msg->datapath_command = DATAPATH_COMMAND_NONE; msg->datapath_command = DATAPATH_COMMAND_NONE;
msg->received = 0; msg->received = 0;
#if TIMESYNCH_CONF_ENABLED
msg->tx = msg->rx = timesynch_time(); msg->tx = msg->rx = timesynch_time();
#else /* TIMESYNCH_CONF_ENABLED */
msg->tx = msg->rx = 0;
#endif /* TIMESYNCH_CONF_ENABLED */
rimeaddr_copy(&msg->receiver, &receiver); rimeaddr_copy(&msg->receiver, &receiver);
left_to_send--; left_to_send--;
return 1; return 1;
@ -328,7 +332,12 @@ process_incoming_packet(void)
rtimer_clock_t now; rtimer_clock_t now;
struct datapath_msg msg_copy; struct datapath_msg msg_copy;
#if TIMESYNCH_CONF_ENABLED
now = timesynch_time(); now = timesynch_time();
#else /* TIMESYNCH_CONF_ENABLED */
now = 0;
#endif /* TIMESYNCH_CONF_ENABLED */
memcpy_misaligned(&msg_copy, (uint8_t *)msg, sizeof(msg_copy)); memcpy_misaligned(&msg_copy, (uint8_t *)msg, sizeof(msg_copy));
stats.received++; stats.received++;
stats.total_tx_latency += msg_copy.rx - msg_copy.tx; stats.total_tx_latency += msg_copy.rx - msg_copy.tx;
@ -339,7 +348,11 @@ static int
construct_reply(const rimeaddr_t *from) construct_reply(const rimeaddr_t *from)
{ {
struct datapath_msg *msg = packetbuf_dataptr(); struct datapath_msg *msg = packetbuf_dataptr();
#if TIMESYNCH_CONF_ENABLED
rtimer_clock_t now = timesynch_time(); rtimer_clock_t now = timesynch_time();
#else /* TIMESYNCH_CONF_ENABLED */
rtimer_clock_t now = 0;
#endif /* TIMESYNCH_CONF_ENABLED */
memcpy_misaligned(&msg->rx, &now, sizeof(rtimer_clock_t)); memcpy_misaligned(&msg->rx, &now, sizeof(rtimer_clock_t));

6
apps/shell/shell-sky.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: shell-sky.c,v 1.14 2010/01/14 15:05:40 joxe Exp $ * $Id: shell-sky.c,v 1.15 2010/02/18 20:56:12 adamdunkels Exp $
*/ */
/** /**
@ -143,7 +143,11 @@ PROCESS_THREAD(shell_sense_process, ev, data)
msg.len = 7; msg.len = 7;
msg.clock = clock_time(); msg.clock = clock_time();
#if TIMESYNCH_CONF_ENABLED
msg.timesynch_time = timesynch_time(); msg.timesynch_time = timesynch_time();
#else /* TIMESYNCH_CONF_ENABLED */
msg.timesynch_time = 0;
#endif /* TIMESYNCH_CONF_ENABLED */
msg.light1 = light_sensor.value(0); msg.light1 = light_sensor.value(0);
msg.light2 = light_sensor.value(1); msg.light2 = light_sensor.value(1);
msg.temp = sht11_temp(); msg.temp = sht11_temp();