[Tinyos-2-commits] CVS: tinyos-2.x/support/sdk/java/net/tinyos/packet AbstractSource.java, 1.2, 1.3 BaudRate.java, 1.2, 1.3 BuildSource.java, 1.2, 1.3 ByteSource.java, 1.2, 1.3 Makefile, 1.2, 1.3 NetworkByteSource.java, 1.2, 1.3 PacketListenerIF.java, 1.2, 1.3 PacketSource.java, 1.2, 1.3 Packetizer.java, 1.2, 1.3 PhoenixError.java, 1.2, 1.3 PhoenixSource.java, 1.2, 1.3 SFProtocol.java, 1.2, 1.3 SFSource.java, 1.2, 1.3 SerialByteSource.java, 1.2, 1.3 StreamByteSource.java, 1.2, 1.3

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/packet
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22851/support/sdk/java/net/tinyos/packet

Modified Files:
	AbstractSource.java BaudRate.java BuildSource.java 
	ByteSource.java Makefile NetworkByteSource.java 
	PacketListenerIF.java PacketSource.java Packetizer.java 
	PhoenixError.java PhoenixSource.java SFProtocol.java 
	SFSource.java SerialByteSource.java StreamByteSource.java 
Log Message:
Merge over into the trunk.



Index: BaudRate.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/packet/BaudRate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaudRate.java	12 Jul 2006 16:59:56 -0000	1.2
--- BaudRate.java	7 Nov 2006 19:30:41 -0000	1.3
***************
*** 16,22 ****
  	Platform.add(Platform.x, "telos",      115200);
  	Platform.add(Platform.x, "telosb",     115200);
  	Platform.add(Platform.x, "tmote",      115200);
  	Platform.add(Platform.x, "micaz",      57600);
! 	Platform.add(Platform.x, "eyes",       115200);
  	Platform.add(Platform.x, "intelmote2", 115200);
      }
--- 16,23 ----
  	Platform.add(Platform.x, "telos",      115200);
  	Platform.add(Platform.x, "telosb",     115200);
+ 	Platform.add(Platform.x, "tinynode",     115200);
  	Platform.add(Platform.x, "tmote",      115200);
  	Platform.add(Platform.x, "micaz",      57600);
! 	Platform.add(Platform.x, "eyesIFX",       57600);
  	Platform.add(Platform.x, "intelmote2", 115200);
      }



Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/packet/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	12 Jul 2006 16:59:56 -0000	1.2
--- Makefile	7 Nov 2006 19:30:41 -0000	1.3
***************
*** 1,5 ****
  # Makefile for tools/java/net/tinyos/packet
  
! INITIAL_TARGETS = Serial.class
  
  ROOT = ../../..
--- 1,5 ----
  # Makefile for tools/java/net/tinyos/packet
  
! INITIAL_TARGETS = Serial.class Serial.java
  
  ROOT = ../../..
***************
*** 9,12 ****
  SERIAL_H = $(TOS)/lib/serial/Serial.h
  
! Serial.java: $(SERIAL_H)
  	ncg -o $@ -java-classname=net.tinyos.packet.Serial java $(SERIAL_H) Serial.h
--- 9,12 ----
  SERIAL_H = $(TOS)/lib/serial/Serial.h
  
! Serial.java: $(SERIAL_H) FORCE
  	ncg -o $@ -java-classname=net.tinyos.packet.Serial java $(SERIAL_H) Serial.h




Index: Packetizer.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/packet/Packetizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Packetizer.java	12 Jul 2006 16:59:57 -0000	1.2
--- Packetizer.java	7 Nov 2006 19:30:41 -0000	1.3
***************
*** 160,164 ****
  	    }
  	    catch (IOException e) { }
! 	    message(name + ": ignoring unknown packet type " +
  		    Integer.toHexString(packetType));
  	}
--- 160,164 ----
  	    }
  	    catch (IOException e) { }
! 	    message(name + ": ignoring unknown packet type 0x" +
  		    Integer.toHexString(packetType));
  	}