[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/harvard/spaulding/src/dataStore/TestPerformance TestPerformanceM.nc, 1.1.1.1, 1.2 TestPerformanceMsg.h, 1.1.1.1, 1.2

[Konrad Lorincz]

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

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

Index: TestPerformanceM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/dataStore/TestPerformance/TestPerformanceM.nc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TestPerformanceM.nc	22 Aug 2007 00:43:53 -0000	1.1.1.1
--- TestPerformanceM.nc	17 Dec 2007 20:47:41 -0000	1.2
***************
*** 54,58 ****
      enum {BLOCK_DATA_MAX_BYTES_TO_SET = 16};
  
!     time_t startTimeReq = 0;
  
      // what we actually send back    
--- 54,58 ----
      enum {BLOCK_DATA_MAX_BYTES_TO_SET = 16};
  
!     uint32_t startTimeReq = 0;
  
      // what we actually send back    
***************
*** 73,77 ****
      inline void startRequest(RequestType nextRequest);
      inline void handleNextRequest();
!     inline time_t getCurrentTime();
      result_t addBlock(Block *blockPtr, uint16_t startValue);
      result_t getBlock(Block *blockPtr, blocksqnnbr_t blockSqnNbr);
--- 73,77 ----
      inline void startRequest(RequestType nextRequest);
      inline void handleNextRequest();
!     inline uint32_t getCurrentTime();
      result_t addBlock(Block *blockPtr, uint16_t startValue);
      result_t getBlock(Block *blockPtr, blocksqnnbr_t blockSqnNbr);
***************
*** 134,138 ****
      }
  
!     inline time_t getCurrentTime()
      {
          return call LocalTime.read();
--- 134,138 ----
      }
  
!     inline uint32_t getCurrentTime()
      {
          return call LocalTime.read();

Index: TestPerformanceMsg.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/dataStore/TestPerformance/TestPerformanceMsg.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TestPerformanceMsg.h	22 Aug 2007 00:43:53 -0000	1.1.1.1
--- TestPerformanceMsg.h	17 Dec 2007 20:47:41 -0000	1.2
***************
*** 37,42 ****
  enum { AM_TESTPERFORMANCEMSG = 19 };
  
- typedef uint32_t time_t;
- 
  typedef struct TestPerformanceMsg
  {
--- 37,40 ----
***************
*** 44,49 ****
      uint16_t sqnNbr;
      uint16_t nbrRequests;
!     time_t   elapsedTimeAdd;
!     time_t   elapsedTimeGet;
  
      // Flash constants - size and partition info
--- 42,47 ----
      uint16_t sqnNbr;
      uint16_t nbrRequests;
!     uint32_t elapsedTimeAdd;
!     uint32_t elapsedTimeGet;
  
      // Flash constants - size and partition info