[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/harvard/spaulding/src/samplingToDataStore/testSamplingToDataStore TestSamplingToDataStoreM.nc, 1.1.1.1, 1.2

[Konrad Lorincz]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/samplingToDataStore/testSamplingToDataStore
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17935/src/samplingToDataStore/testSamplingToDataStore

Modified Files:
	TestSamplingToDataStoreM.nc 
Log Message:
renamed type time_t to uint32_t because of conflicts with the builtin time_t definition

Index: TestSamplingToDataStoreM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/samplingToDataStore/testSamplingToDataStore/TestSamplingToDataStoreM.nc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TestSamplingToDataStoreM.nc	22 Aug 2007 00:43:55 -0000	1.1.1.1
--- TestSamplingToDataStoreM.nc	17 Dec 2007 20:47:41 -0000	1.2
***************
*** 87,91 ****
          //printfUART("    NBR_SAMPLES_PER_CHUNK= %i\n", (uint16_t) NBR_SAMPLES_PER_CHUNK);                         
  
!         printfUART("\n    sizeof(time_t)= %i\n", (uint16_t) sizeof(time_t));                         
          printfUART("    sizeof(channelID_t)= %i\n", (uint16_t) sizeof(channelID_t));                         
          printfUART("    sizeof(sample_t)= %i\n", (uint16_t) sizeof(sample_t));
--- 87,91 ----
          //printfUART("    NBR_SAMPLES_PER_CHUNK= %i\n", (uint16_t) NBR_SAMPLES_PER_CHUNK);                         
  
!         printfUART("\n    sizeof(uint32_t)= %i\n", (uint16_t) sizeof(uint32_t));                         
          printfUART("    sizeof(channelID_t)= %i\n", (uint16_t) sizeof(channelID_t));                         
          printfUART("    sizeof(sample_t)= %i\n", (uint16_t) sizeof(sample_t));
***************
*** 174,178 ****
                  samplingMsgPtr->timeStamp = scPtr->timeStamp;
              else {
!                 time_t timeDelta =  ((time_t)nextSampleToSend*(time_t)LOCAL_TIME_RATE_HZ) / (time_t)MERCURY_SAMPLING_RATE;  
                  samplingMsgPtr->timeStamp = scPtr->timeStamp + timeDelta;               
              }
--- 174,178 ----
                  samplingMsgPtr->timeStamp = scPtr->timeStamp;
              else {
!                 uint32_t timeDelta =  ((uint32_t)nextSampleToSend*(uint32_t)LOCAL_TIME_RATE_HZ) / (uint32_t)MERCURY_SAMPLING_RATE;  
                  samplingMsgPtr->timeStamp = scPtr->timeStamp + timeDelta;               
              }