[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/cc1000 CC1000Interface.java, 1.2, 1.2.4.1

[Kristin Wright]

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

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

Index: CC1000Interface.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/cc1000/CC1000Interface.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** CC1000Interface.java	6 Aug 2004 01:11:13 -0000	1.2
--- CC1000Interface.java	11 Nov 2004 13:43:27 -0000	1.2.4.1
***************
*** 28,32 ****
      int nodeID = Integer.parseInt(args[0]);
  
!     DripMsg dripMsg = new DripMsg(2+NamingMsg.DEFAULT_MESSAGE_SIZE+CC1000InterfaceDripMsg.DEFAULT_MESSAGE_SIZE);
  
      dripMsg.set_metadata_id((short)CC1000InterfaceDripMsg.AM_TYPE);
--- 28,33 ----
      int nodeID = Integer.parseInt(args[0]);
  
!     DripMsg dripMsg = new DripMsg(2+NamingMsg.DEFAULT_MESSAGE_SIZE+
! 				  CC1000InterfaceDripMsg.DEFAULT_MESSAGE_SIZE);
  
      dripMsg.set_metadata_id((short)CC1000InterfaceDripMsg.AM_TYPE);