[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/powermgmt PowerMgmt.java, 1.7, 1.7.4.1

[Kristin Wright]

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

Modified Files:
      Tag: tos-1-1-8-candidate
	PowerMgmt.java 
Log Message:
merge with trunk using the tos-1-1-8-postbugfix trunk snapshot

Index: PowerMgmt.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/powermgmt/PowerMgmt.java,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -C2 -d -r1.7 -r1.7.4.1
*** PowerMgmt.java	7 Sep 2004 23:32:22 -0000	1.7
--- PowerMgmt.java	11 Nov 2004 13:43:29 -0000	1.7.4.1
***************
*** 84,88 ****
      }
  
!     DripMsg dripMsg = new DripMsg();
  
      dripMsg.set_metadata_id((short)PowerMgmtCmdMsg.AM_TYPE);
--- 84,90 ----
      }
  
!     DripMsg dripMsg = new DripMsg(DripMsg.DEFAULT_MESSAGE_SIZE + 
! 				  NamingMsg.DEFAULT_MESSAGE_SIZE +
! 				  PowerMgmtCmdMsg.DEFAULT_MESSAGE_SIZE);
  
      dripMsg.set_metadata_id((short)PowerMgmtCmdMsg.AM_TYPE);