Debug TPM settings

[~andy/csm213a-hw] / hw2 / messages.h

diff --git a/hw2/messages.h b/hw2/messages.h
index e18166bd66b987dc37d588ae700f9355550b5852..752476fb2c4ecd60b8fd2425b72171eceb868be0 100644 (file)
--- a/hw2/messages.h
+++ b/hw2/messages.h
@@ -6,10 +6,11 @@
 
 #define MSG_HEADER       0x1234
 
-#define MSG_VALID_DEVICE 0x0001
-#define MSG_VALID_START  0x0002
-#define MSG_VALID_PERIOD 0x0004
-#define MSG_VALID_WORLD  0x0008
+#define MSG_VALID_DEVICE 0x0001  // device id is valid
+#define MSG_VALID_WORLD  0x0002  // world time is valid
+#define MSG_VALID_START  0x0004  // start time is valid
+#define MSG_VALID_PERIOD 0x0008  // period is valid
+#define MSG_VALID_SYNC   0x8000  // begin time sync
 
 #pragma pack(1)
 
@@ -21,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;
 
@@ -35,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()