[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250/mac CsmaMacC.nc, 1.1.2.9, 1.1.2.10 CsmaMacP.nc, 1.1.2.10, 1.1.2.11

[Philipp Huppertz]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11833/tos/chips/tda5250/mac

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CsmaMacC.nc CsmaMacP.nc 
Log Message:
- added Andreas Koepke's improvements and fixes to the tda5250 and /lib/byte_radio
- improved unconnected ASKNFSK pin handling/wireing on eyes

Index: CsmaMacC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/CsmaMacC.nc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** CsmaMacC.nc	15 Aug 2006 13:54:06 -0000	1.1.2.9
--- CsmaMacC.nc	12 Sep 2006 12:16:31 -0000	1.1.2.10
***************
*** 85,89 ****
      CsmaMacP.ChannelMonitorControl -> Cca.ChannelMonitorControl;
      CsmaMacP.RssiAdcResource -> Cca.RssiAdcResource;
!     
      CsmaMacP.Random -> RandomLfsrC;
  
--- 85,92 ----
      CsmaMacP.ChannelMonitorControl -> Cca.ChannelMonitorControl;
      CsmaMacP.RssiAdcResource -> Cca.RssiAdcResource;
! 
!     components ActiveMessageAddressC;
!     CsmaMacP.amAddress -> ActiveMessageAddressC;
! 
      CsmaMacP.Random -> RandomLfsrC;
  

Index: CsmaMacP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/CsmaMacP.nc,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** CsmaMacP.nc	15 Aug 2006 13:54:06 -0000	1.1.2.10
--- CsmaMacP.nc	12 Sep 2006 12:16:31 -0000	1.1.2.11
***************
*** 33,36 ****
--- 33,37 ----
  #include "radiopacketfunctions.h"
  #include "flagfunctions.h"
+ #include "PacketAck.h"
  
   /**
***************
*** 71,74 ****
--- 72,77 ----
          
[...1047 lines suppressed...]
          if(call RssiAdcResource.isOwner()) call ChannelMonitorData.getSnr();
+         if(macState == RX_P) call ChannelMonitor.rxSuccess();
      }
      
***************
*** 752,759 ****
          macState_t ms;
          atomic ms = macState;
!         if((ms == SW_CCA) || (ms == CCA)) {
!             storeOldState(144);
!         }
!         else if(ms == INIT) {
              storeOldState(145);
              call ChannelMonitorControl.updateNoiseFloor();            
--- 971,975 ----
          macState_t ms;
          atomic ms = macState;
!         if((ms == INIT) && isFlagSet(&flags, RSSI_STABLE)) {
              storeOldState(145);
              call ChannelMonitorControl.updateNoiseFloor();