X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=hw2%2Fmessages.h;h=752476fb2c4ecd60b8fd2425b72171eceb868be0;hb=16ad7d215971b9bbd79007f7c334c4f8d9659c49;hp=af40683c9628f79a340fd49069cdf60bc1d76b07;hpb=d5dd8b1b26fb8e11ffaaaa89d58570a19aaeba7d;p=~andy%2Fcsm213a-hw

diff --git a/hw2/messages.h b/hw2/messages.h
index af40683..752476f 100644
--- a/hw2/messages.h
+++ b/hw2/messages.h
@@ -22,7 +22,7 @@ typedef enum {
 } msgid_t;
 
 typedef struct {
-	uint32_t seconds;  // Seconds since 1970 (without leap seconds)
+	uint32_t seconds;  // Seconds since 1970
 	uint32_t nanosec;  // Nanoseconds since 'seconds'
 } ntime_t;
 
@@ -36,20 +36,20 @@ typedef struct {
 typedef struct {
 	uint16_t valid;    // Message valid bits
 	uint16_t device;   // Device ID to use
+	ntime_t  world;    // World time (since 1970)
 	ntime_t  start;    // Transmit start time 
 	ntime_t  period;   // Transmit period
-	ntime_t  world;    // World time (since 1970)
 } init_msg_t;
 
 typedef struct {
-	uint32_t seq;      // Current sequence counter
 	ntime_t  time;     // Time of previous message
 } sync_msg_t;
 
 typedef struct {
 	uint16_t device;   // Device ID
 	uint16_t event;    // Event ID
-	ntime_t  time;     // Timestamp
+	ntime_t  world;    // UTC Time of event
+	ntime_t  local;    // Time since turn-on
 } event_msg_t;
 
 #pragma pack()