[Tinyos-2-commits] CVS: tinyos-2.x/tos/system AMQueueEntryP.nc, 1.3, 1.4 AMQueueImplP.nc, 1.3, 1.4 AMQueueP.nc, 1.3, 1.4 AMReceiverC.nc, 1.3, 1.4 AMSenderC.nc, 1.3, 1.4 AMSnooperC.nc, 1.3, 1.4 AMSnoopingReceiverC.nc, 1.3, 1.4 ActiveMessageAddressC.nc, 1.3, 1.4 ActiveMessageImplP.nc, 1.3, 1.4 ArbitratedReadC.nc, 1.4, 1.5 ArbitratedReadNowC.nc, 1.3, 1.4 ArbitratedReadStreamC.nc, 1.3, 1.4 BitVectorC.nc, 1.3, 1.4 ConstantSensorC.nc, 1.3, 1.4 FcfsArbiterC.nc, 1.3, 1.4 FcfsPriorityArbiterC.nc, 1.3, 1.4 FcfsResourceQueueC.nc, 1.3, 1.4 LedsC.nc, 1.3, 1.4 LedsP.nc, 1.3, 1.4 MainC.nc, 1.3, 1.4 NoInitC.nc, 1.3, 1.4 NoLedsC.nc, 1.3, 1.4 NoLedsP.nc, 1.3, 1.4 NoPinC.nc, 1.3, 1.4 PoolC.nc, 1.3, 1.4 PoolP.nc, 1.3, 1.4 QueueC.nc, 1.3, 1.4 RandomLfsrP.nc, 1.3, 1.4 RealMainP.nc, 1.3, 1.4 RoundRobinArbiterC.nc, 1.3, 1.4 RoundRobinResourceQueueC.nc, 1.3, 1.4 SchedulerBasicP.nc, 1.3, 1.4 SineSensorC.nc, 1.3, 1.4 TimerMilliC.nc, 1.3, 1.4 TimerMilliP.nc, 1.3, 1.4 TinySchedulerC.nc, 1.3, 1.4 crc.h, 1.3, 1.4 dbg.h, 1.3, 1.4 tos.h, 1.2, 1.3 State.nc, 1.2, NONE

[Vlado Handziski]

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

Modified Files:
	AMQueueEntryP.nc AMQueueImplP.nc AMQueueP.nc AMReceiverC.nc 
	AMSenderC.nc AMSnooperC.nc AMSnoopingReceiverC.nc 
	ActiveMessageAddressC.nc ActiveMessageImplP.nc 
	ArbitratedReadC.nc ArbitratedReadNowC.nc 
	ArbitratedReadStreamC.nc BitVectorC.nc ConstantSensorC.nc 
	FcfsArbiterC.nc FcfsPriorityArbiterC.nc FcfsResourceQueueC.nc 
	LedsC.nc LedsP.nc MainC.nc NoInitC.nc NoLedsC.nc NoLedsP.nc 
	NoPinC.nc PoolC.nc PoolP.nc QueueC.nc RandomLfsrP.nc 
	RealMainP.nc RoundRobinArbiterC.nc RoundRobinResourceQueueC.nc 
	SchedulerBasicP.nc SineSensorC.nc TimerMilliC.nc 
	TimerMilliP.nc TinySchedulerC.nc crc.h dbg.h tos.h 
Removed Files:
	State.nc 
Log Message:
Swapping HEAD and DEVEL branches



















Index: LedsP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/LedsP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LedsP.nc	7 Nov 2006 19:31:28 -0000	1.3
--- LedsP.nc	12 Dec 2006 18:23:47 -0000	1.4
***************
*** 110,120 ****
      atomic {
        rval = 0;
!       if (call Led0.get()) {
  	rval |= LEDS_LED0;
        }
!       if (call Led1.get()) {
  	rval |= LEDS_LED1;
        }
!       if (call Led2.get()) {
  	rval |= LEDS_LED2;
        }
--- 110,120 ----
      atomic {
        rval = 0;
!       if (!call Led0.get()) {
  	rval |= LEDS_LED0;
        }
!       if (!call Led1.get()) {
  	rval |= LEDS_LED1;
        }
!       if (!call Led2.get()) {
  	rval |= LEDS_LED2;
        }




















Index: tos.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/tos.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tos.h	12 Jul 2006 17:03:21 -0000	1.2
--- tos.h	12 Dec 2006 18:23:47 -0000	1.3
***************
*** 20,24 ****
  enum { FALSE = 0, TRUE = 1 };
  
! typedef int8_t nx_bool __attribute__((nx_base(int8)));
  uint16_t TOS_NODE_ID = 1;
  
--- 20,24 ----
  enum { FALSE = 0, TRUE = 1 };
  
! typedef nx_int8_t nx_bool;
  uint16_t TOS_NODE_ID = 1;
  

--- State.nc DELETED ---