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

[Philipp Huppertz]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CsmaMacC.nc CsmaMacP.nc 
Log Message:
- radio is now informed (via ResourceRequested) if another client wants the uart (usart) resource (for example the flash)
- needs to be tested more...

Index: CsmaMacC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/CsmaMacC.nc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** CsmaMacC.nc	3 Aug 2006 18:17:52 -0000	1.1.2.8
--- CsmaMacC.nc	15 Aug 2006 13:54:06 -0000	1.1.2.9
***************
*** 55,59 ****
  implementation {
    components  MainC,
! //       Tda5250RadioC,    
        CsmaMacP,
        RssiFixedThresholdCMC as Cca,
--- 55,59 ----
  implementation {
    components  MainC,
!       Tda5250RadioC,    
        CsmaMacP,
        RssiFixedThresholdCMC as Cca,
***************
*** 88,92 ****
      CsmaMacP.Random -> RandomLfsrC;
  
! //     CsmaMacP.RadioResourceRequested -> Tda5250RadioC.ResourceRequested;
  
      CsmaMacP.Timer -> Timer;
--- 88,92 ----
      CsmaMacP.Random -> RandomLfsrC;
  
!     CsmaMacP.RadioResourceRequested -> Tda5250RadioC.ResourceRequested;
  
      CsmaMacP.Timer -> Timer;

Index: CsmaMacP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/CsmaMacP.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
*** CsmaMacP.nc	3 Aug 2006 18:17:52 -0000	1.1.2.9
--- CsmaMacP.nc	15 Aug 2006 13:54:06 -0000	1.1.2.10
***************
*** 58,62 ****
          
          interface Tda5250Control as RadioModes;  
! //         interface ResourceRequested as RadioResourceRequested;
  
          interface UartPhyControl;
--- 58,62 ----
          
          interface Tda5250Control as RadioModes;  
!         interface ResourceRequested as RadioResourceRequested;
  
          interface UartPhyControl;
***************
*** 766,779 ****
      
      /***** RadioData Resource events **************/
! //     async event void RadioResourceRequested.requested() {
! //       atomic {
! //         /* This gives other devices the chance to get the Resource
! //            because RxMode implies a new arbitration round.  */
! //         if (macState == RX) setRxMode();
! //       }
! //     }
! //     
! //     // we don't care about urgent Resource requestes
! //     async event void RadioResourceRequested.immediateRequested() {}
  }
  
--- 766,779 ----
      
      /***** RadioData Resource events **************/
!     async event void RadioResourceRequested.requested() {
!       atomic {
!         /* This gives other devices the chance to get the Resource
!            because RxMode implies a new arbitration round.  */
!         if (macState == RX) setRxMode();
!       }
!     }
!     
!     // we don't care about urgent Resource requestes
!     async event void RadioResourceRequested.immediateRequested() {}
  }