[Tinyos-2-commits] CVS: tinyos-2.x/apps/tosthreads/capps/SenseAndSend SenseAndSend.c, 1.1, 1.2

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tosthreads/capps/SenseAndSend
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27309/capps/SenseAndSend

Modified Files:
	SenseAndSend.c 
Log Message:
Update to TestCollection for C based API

Index: SenseAndSend.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tosthreads/capps/SenseAndSend/SenseAndSend.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SenseAndSend.c	12 Jun 2008 15:11:39 -0000	1.1
--- SenseAndSend.c	17 Jun 2008 19:07:48 -0000	1.2
***************
*** 79,84 ****
    barrier_reset(&sense_barrier, NUM_SENSORS+1);
    sensor_data = radioGetPayload(&send_msg, sizeof(sensor_data_t));
!   //sensor_data->seq_no = 0;
!   __nesc_hton_uint32((unsigned char *)&sensor_data->seq_no, (unsigned long )0);
  
    amRadioStart();
--- 79,83 ----
    barrier_reset(&sense_barrier, NUM_SENSORS+1);
    sensor_data = radioGetPayload(&send_msg, sizeof(sensor_data_t));
!   sensor_data->seq_no = 0;
  
    amRadioStart();
***************
*** 95,100 ****
      (*read)(&val);
      mutex_lock(&data_mutex);
!     //  *nx_val = val;
!     __nesc_hton_uint16((unsigned char *)&*nx_val, val);
      mutex_unlock(&data_mutex);
      barrier_block(&send_barrier);
--- 94,98 ----
      (*read)(&val);
      mutex_lock(&data_mutex);
!      *nx_val = val;
      mutex_unlock(&data_mutex);
      barrier_block(&send_barrier);
***************
*** 116,123 ****
  }
  void send_thread(void* arg) {
-   //Only needed for nesC magic.... I hate this hack.....
-   unsigned long __nesc_temp43;
-   unsigned char *__nesc_temp42;
- 
    for(;;) {
      barrier_block(&send_barrier);
--- 114,117 ----
***************
*** 125,130 ****
      
      if(amRadioSend(AM_BROADCAST_ADDR, &send_msg, sizeof(sensor_data_t), AM_SENSOR_DATA_MSG) == SUCCESS) {
!       //sensor_data->seq_no++;
!       (__nesc_temp42 = (unsigned char *)&sensor_data->seq_no, __nesc_hton_uint32(__nesc_temp42, (__nesc_temp43 = __nesc_ntoh_uint32(__nesc_temp42)) + 1), __nesc_temp43);
        led0Toggle();
      }
--- 119,123 ----
      
      if(amRadioSend(AM_BROADCAST_ADDR, &send_msg, sizeof(sensor_data_t), AM_SENSOR_DATA_MSG) == SUCCESS) {
!       sensor_data->seq_no++;
        led0Toggle();
      }