[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/harvard/spaulding/src/sampling MultiChanSampling.h, 1.1.1.1, 1.2 SamplingMsg.h, 1.1.1.1, 1.2

[Konrad Lorincz]

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

Modified Files:
	MultiChanSampling.h SamplingMsg.h 
Log Message:
renamed type time_t to uint32_t because of conflicts with the builtin time_t definition

Index: MultiChanSampling.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/sampling/MultiChanSampling.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MultiChanSampling.h	22 Aug 2007 00:43:54 -0000	1.1.1.1
--- MultiChanSampling.h	17 Dec 2007 20:47:41 -0000	1.2
***************
*** 36,40 ****
  #define MULTICHANSAMPLING_H
  
- typedef uint32_t  time_t;
  typedef uint16_t  sample_t;
  typedef uint8_t   channelID_t;
--- 36,39 ----

Index: SamplingMsg.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/sampling/SamplingMsg.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SamplingMsg.h	22 Aug 2007 00:43:54 -0000	1.1.1.1
--- SamplingMsg.h	17 Dec 2007 20:47:41 -0000	1.2
***************
*** 38,42 ****
  enum { AM_SAMPLINGMSG = 19 };
  // WARNING: Make sure the size corresponds to how the SamplingMsg struct is defined! 
! #define SAMPLINGMSG_MAX_SAMPLES  ((TOSH_DATA_LENGTH - 2 - 2 -sizeof(time_t) - 2) / sizeof(sample_t))
  
  
--- 38,42 ----
  enum { AM_SAMPLINGMSG = 19 };
  // WARNING: Make sure the size corresponds to how the SamplingMsg struct is defined! 
! #define SAMPLINGMSG_MAX_SAMPLES  ((TOSH_DATA_LENGTH - 2 - 2 -sizeof(uint32_t) - 2) / sizeof(sample_t))
  
  
***************
*** 46,50 ****
      uint16_t srcAddr;
      uint16_t sqnNbr;
!     time_t   timeStamp;         // of the 1st sample
      uint16_t nbrSamples;        // in this message (nbrSamples <= SAMPLINGMSG_MAX_SAMPLES)
      sample_t samples[SAMPLINGMSG_MAX_SAMPLES];
--- 46,50 ----
      uint16_t srcAddr;
      uint16_t sqnNbr;
!     uint32_t timeStamp;         // of the 1st sample
      uint16_t nbrSamples;        // in this message (nbrSamples <= SAMPLINGMSG_MAX_SAMPLES)
      sample_t samples[SAMPLINGMSG_MAX_SAMPLES];