[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/DelugeMonitor DelugeMonitorC.nc, 1.2, 1.3 DelugeMonitorM.nc, 1.5, 1.6

[Gilman Tolle]

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

Modified Files:
	DelugeMonitorC.nc DelugeMonitorM.nc 
Log Message:
added support for monitoring deluge image contents

Index: DelugeMonitorC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/DelugeMonitor/DelugeMonitorC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DelugeMonitorC.nc	9 Aug 2004 23:43:54 -0000	1.2
--- DelugeMonitorC.nc	20 Sep 2004 21:55:05 -0000	1.3
***************
*** 13,15 ****
--- 13,16 ----
    DelugeMonitorM.MA_DownloadingImgPageNum -> MgmtAttrsC.MgmtAttr[unique("MgmtAttr")];
    DelugeMonitorM.MA_DownloadingImgTotalPages -> MgmtAttrsC.MgmtAttr[unique("MgmtAttr")];  
+   DelugeMonitorM.MA_ImgSummary -> MgmtAttrsC.MgmtAttr[unique("MgmtAttr")];  
  }

Index: DelugeMonitorM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/DelugeMonitor/DelugeMonitorM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DelugeMonitorM.nc	24 Aug 2004 02:29:50 -0000	1.5
--- DelugeMonitorM.nc	20 Sep 2004 21:55:05 -0000	1.6
***************
*** 8,11 ****
--- 8,12 ----
      interface MgmtAttr as MA_DownloadingImgPageNum;
      interface MgmtAttr as MA_DownloadingImgTotalPages;
+     interface MgmtAttr as MA_ImgSummary;
    } 
  }
***************
*** 20,23 ****
--- 21,25 ----
      call MA_DownloadingImgPageNum.init(sizeof(uint8_t), MA_TYPE_UINT);
      call MA_DownloadingImgTotalPages.init(sizeof(uint8_t), MA_TYPE_UINT);
+     call MA_ImgSummary.init(8, MA_TYPE_OCTETSTRING);
      return SUCCESS;
    }
***************
*** 64,67 ****
--- 66,74 ----
    }
  
+   event result_t MA_ImgSummary.getAttr(uint8_t *buf) {
+     call DelugeMetadata.getImgSummaries((DelugeImgSummary*) buf);
+     return SUCCESS;
+   }
+ 
    event result_t DelugeMetadata.applyPageDiffDone(result_t result) {
      return SUCCESS;