Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / net / Deluge / Deluge.h

diff --git a/tos/lib/net/Deluge/Deluge.h b/tos/lib/net/Deluge/Deluge.h
index c9ec9cbeecb7764b58423988b6613c3342edee33..ec1952010c6bf66cd7a164e54c4a9086ada70a62 100644 (file)
--- a/tos/lib/net/Deluge/Deluge.h
+++ b/tos/lib/net/Deluge/Deluge.h
@@ -27,26 +27,52 @@
 #ifndef __DELUGE_H__
 #define __DELUGE_H__
 
-#include "DelugeMetadata.h"
+typedef nx_struct DelugeIdent {
+  nx_uint32_t  uidhash;        // unique id of the image
+  nx_uint32_t  size;           // size of the whole image (ident + CRCs + binary)
+  nx_uint8_t   numPgs;         // number of pages of complete image
+  nx_uint8_t   reserved;
+  nx_uint16_t  crc;            // crc over the above 4 fields
+  nx_uint8_t   appname[16];
+  nx_uint8_t   username[16];
+  nx_uint8_t   hostname[16];
+  nx_uint8_t   platform[16];
+  nx_uint32_t  timestamp;
+  nx_uint32_t  userhash;
+} DelugeIdent;
 
 enum {
   DELUGE_INVALID_UID = 0xffffffff,
-  DELUGE_NUM_VOLUMES = 2,
+  DELUGE_NUM_VOLUMES = 4, 
+  DELUGE_KEY = 0xDE00,
+  DELUGE_AM_FLASH_VOL_MANAGER = 0x53,
+  DELUGE_AM_DELUGE_MANAGER = 0x54,
 };
 
-typedef nx_struct DelugeDissemination {
-  nx_uint32_t uid;      // unique id of image
-  nx_uint16_t vNum;     // version num of image
+enum {
+  DELUGE_CMD_STOP = 1,
+  DELUGE_CMD_LOCAL_STOP = 2,
+  DELUGE_CMD_ONLY_DISSEMINATE = 3,
+  DELUGE_CMD_DISSEMINATE_AND_REPROGRAM = 4,
+  DELUGE_CMD_REPROGRAM = 5, // Reprogram the local mote
+  DELUGE_CMD_REBOOT = 6,    // Reboot the local mode
+};
+
+#define UQ_DELUGE_METADATA "DelugeMetadata.client"
+#define UQ_DELUGE_VOLUME_MANAGER "DelugeVolumeManager.client"
+
+typedef nx_struct DelugeCmd {
+  nx_uint8_t type;
+  nx_uint32_t uidhash;  // unique id of image
   nx_uint8_t  imgNum;   // image number
-  nx_uint16_t size;     // size of the image
-} DelugeDissemination;
-
-typedef struct DelugeNodeDesc {
-  imgvnum_t vNum;
-  uint32_t  uid;
-  imgnum_t  imgNum;
-  uint8_t   reserved;
-  uint16_t  crc;
-} DelugeNodeDesc;
+  nx_uint32_t size;     // size of the image
+} DelugeCmd;
+
+typedef struct BootArgs {
+  uint16_t  address;
+  uint32_t imageAddr;
+  uint8_t  gestureCount;
+  bool     noReprogram;
+} BootArgs;
 
 #endif