[Tinyos-beta-commits] CVS: tinyos-1.x/beta/TinierDB TimeSync.nc, NONE, 1.1 TimeStamp.h, 1.1, 1.2

[Stan Rost]

Update of /cvsroot/tinyos/tinyos-1.x/beta/TinierDB
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10322

Modified Files:
	TimeStamp.h 
Added Files:
	TimeSync.nc 
Log Message:
- Added TimeSync.nc (doh!)
- Extended timestamping operations


--- NEW FILE: TimeSync.nc ---
interface TimeSync {
  
  /**
   * Returns the amount of desynchronization
   * from the authoritative node, in binticks
   **/
  command uint32_t getConfidence();
}

Index: TimeStamp.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/TinierDB/TimeStamp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TimeStamp.h	27 Aug 2004 20:55:11 -0000	1.1
--- TimeStamp.h	14 Sep 2004 17:44:48 -0000	1.2
***************
*** 15,18 ****
--- 15,22 ----
  }
  
+ uint64_t timeStamp2ulint(TimeStamp t) {
+   return *(uint32_t *)(&t[1]) + (((uint64_t)t[0]) << 32);
+ }
+ 
  uint32_t timeStampDiv32(TimeStamp t, uint32_t _div) {
    uint64_t num = 
***************
*** 27,30 ****
--- 31,39 ----
  }
  
+ void ulint2timeStamp(uint64_t t, TimeStamp ts) {
+   ts[0] = ((uint8_t *)&t)[1];
+   *(uint32_t *)(&ts[1]) = ((uint32_t *)&t)[1];
+ }
+ 
  void timeStampAdd16(TimeStamp t, uint16_t amt) {
    uint32_t oldAmt = *(uint32_t *)(&t[1]);
***************
*** 66,69 ****
--- 75,81 ----
  }
  
+ void timeStampCopy(TimeStamp tgt, TimeStamp src) {
+   memcpy(tgt, src, sizeof(TimeStamp));
+ }
  
  #endif