[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net DisseminationUpdate.nc, 1.4, 1.5 UARTDebugSenderP.nc, 1.3, 1.4

[John Regehr]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12845

Modified Files:
	DisseminationUpdate.nc UARTDebugSenderP.nc 
Log Message:
safe tinyos annotations

Index: DisseminationUpdate.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/DisseminationUpdate.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DisseminationUpdate.nc	12 Dec 2006 18:23:29 -0000	1.4
--- DisseminationUpdate.nc	4 Jun 2008 04:35:18 -0000	1.5
***************
*** 50,53 ****
     * <tt>change</tt> returns.
     */
!   command void change(t* newVal);
  }
--- 50,53 ----
     * <tt>change</tt> returns.
     */
!   command void change(t* ONE newVal);
  }

Index: UARTDebugSenderP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/UARTDebugSenderP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UARTDebugSenderP.nc	13 Sep 2007 23:10:18 -0000	1.3
--- UARTDebugSenderP.nc	4 Jun 2008 04:35:18 -0000	1.4
***************
*** 101,105 ****
      }
      /* Used for FE_SENT_MSG, FE_RCV_MSG, FE_FWD_MSG, FE_DST_MSG */
!     command error_t CollectionDebug.logEventMsg(uint8_t type, uint16_t msg_id, am_addr_t origin, am_addr_t node) {
          statLogReceived++;
          if (call MessagePool.empty()) {
--- 101,105 ----
      }
      /* Used for FE_SENT_MSG, FE_RCV_MSG, FE_FWD_MSG, FE_DST_MSG */
!     command error_t TRUSTEDBLOCK CollectionDebug.logEventMsg(uint8_t type, uint16_t msg_id, am_addr_t origin, am_addr_t node) {
          statLogReceived++;
          if (call MessagePool.empty()) {
***************
*** 130,134 ****
      }
      /* Used for TREE_NEW_PARENT, TREE_ROUTE_INFO */
!     command error_t CollectionDebug.logEventRoute(uint8_t type, am_addr_t parent, uint8_t hopcount, uint16_t metric) {
          statLogReceived++;
          if (call MessagePool.empty()) {
--- 130,134 ----
      }
      /* Used for TREE_NEW_PARENT, TREE_ROUTE_INFO */
!     command error_t TRUSTEDBLOCK CollectionDebug.logEventRoute(uint8_t type, am_addr_t parent, uint8_t hopcount, uint16_t metric) {
          statLogReceived++;
          if (call MessagePool.empty()) {
***************
*** 186,190 ****
      }
      /* Used for DBG_2, DBG_3 */
!     command error_t CollectionDebug.logEventDbg(uint8_t type, uint16_t arg1, uint16_t arg2, uint16_t arg3) {
          statLogReceived++;
          if (call MessagePool.empty()) {
--- 186,190 ----
      }
      /* Used for DBG_2, DBG_3 */
!     command TRUSTEDBLOCK error_t CollectionDebug.logEventDbg(uint8_t type, uint16_t arg1, uint16_t arg2, uint16_t arg3) {
          statLogReceived++;
          if (call MessagePool.empty()) {