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

[Kevin Klues]

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

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

Index: SenseStoreAndForward.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tosthreads/capps/SenseStoreAndForward/SenseStoreAndForward.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SenseStoreAndForward.c	12 Jun 2008 15:11:40 -0000	1.1
--- SenseStoreAndForward.c	17 Jun 2008 19:07:49 -0000	1.2
***************
*** 85,90 ****
    barrier_reset(&sense_barrier, NUM_SENSORS+1);
    sending_sensor_data = radioGetPayload(&send_msg, sizeof(sensor_data_t));
!   //storing_sensor_data->seq_no = 0;
!   __nesc_hton_uint32((unsigned char *)&storing_sensor_data.seq_no, (unsigned long )0);
  
    amRadioStart();
--- 85,89 ----
    barrier_reset(&sense_barrier, NUM_SENSORS+1);
    sending_sensor_data = radioGetPayload(&send_msg, sizeof(sensor_data_t));
!   storing_sensor_data.seq_no = 0;
  
    amRadioStart();
***************
*** 105,110 ****
      (*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);
--- 104,108 ----
      (*read)(&val);
      mutex_lock(&data_mutex);
!     *nx_val = val;
      mutex_unlock(&data_mutex);
      barrier_block(&send_barrier);
***************
*** 129,136 ****
    bool sensor_records_lost;
    
-   //Only needed for nesC magic.... I hate this hack.....
-   unsigned long __nesc_temp43;
-   unsigned char *__nesc_temp42;
-   
    for(;;) {
      barrier_block(&send_barrier);
--- 127,130 ----
***************
*** 142,147 ****
      mutex_unlock(&log_mutex);
      
!     //storing_sensor_data.seq_no++
!     (__nesc_temp42 = (unsigned char *)&storing_sensor_data.seq_no, __nesc_hton_uint32(__nesc_temp42, (__nesc_temp43 = __nesc_ntoh_uint32(__nesc_temp42)) + 1), __nesc_temp43);
      led0Toggle();
  
--- 136,140 ----
      mutex_unlock(&log_mutex);
      
!     storing_sensor_data.seq_no++;
      led0Toggle();