[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250 HplTda5250DataC.nc, 1.1.2.1, 1.1.2.2 HplTda5250DataP.nc, 1.1.2.9, 1.1.2.10 Tda5250RadioC.nc, 1.1.2.7, 1.1.2.8 Tda5250RadioP.nc, 1.1.2.9, 1.1.2.10

[Philipp Huppertz]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HplTda5250DataC.nc HplTda5250DataP.nc Tda5250RadioC.nc 
	Tda5250RadioP.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: HplTda5250DataC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/Attic/HplTda5250DataC.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** HplTda5250DataC.nc	9 Aug 2006 13:17:06 -0000	1.1.2.1
--- HplTda5250DataC.nc	15 Aug 2006 13:54:06 -0000	1.1.2.2
***************
*** 43,47 ****
      interface HplTda5250Data;
  		interface HplTda5250DataControl;
! //     interface ResourceRequested;
      interface Resource as Resource;
    }
--- 43,47 ----
      interface HplTda5250Data;
  		interface HplTda5250DataControl;
!     interface ResourceRequested;
      interface Resource as Resource;
    }
***************
*** 55,59 ****
    Init = HplTda5250DataP;
    Resource = HplTda5250DataP.Resource;
! //   ResourceRequested = HplTda5250Data.ResourceRequested;
    HplTda5250Data = HplTda5250DataP;
  	HplTda5250DataControl = HplTda5250DataIOC;
--- 55,59 ----
    Init = HplTda5250DataP;
    Resource = HplTda5250DataP.Resource;
!   ResourceRequested = HplTda5250DataP.ResourceRequested;
    HplTda5250Data = HplTda5250DataP;
  	HplTda5250DataControl = HplTda5250DataIOC;
***************
*** 62,66 ****
  	HplTda5250DataP.Uart -> HplTda5250DataIOC.SerialByteComm;
  	HplTda5250DataP.UartResource -> HplTda5250DataIOC.Resource;
! //	HplTda5250DataP.UartResourceRequested -> HplTda5250DataIOC.ResourceRequested;
  
  }
--- 62,66 ----
  	HplTda5250DataP.Uart -> HplTda5250DataIOC.SerialByteComm;
  	HplTda5250DataP.UartResource -> HplTda5250DataIOC.Resource;
! 	HplTda5250DataP.UartResourceRequested -> HplTda5250DataIOC.ResourceRequested;
  
  }

Index: HplTda5250DataP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/HplTda5250DataP.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
*** HplTda5250DataP.nc	15 Aug 2006 11:59:08 -0000	1.1.2.9
--- HplTda5250DataP.nc	15 Aug 2006 13:54:06 -0000	1.1.2.10
***************
*** 43,54 ****
      interface Init;
      interface HplTda5250Data;
      interface Resource;
! 		//     interface ResourceRequested;
    }
    uses {
      interface GeneralIO as DATA;
      interface SerialByteComm as Uart;
      interface Resource as UartResource;
! //     interface ResourceRequested as UartResourceRequested;
    }
  }
--- 43,56 ----
      interface Init;
      interface HplTda5250Data;
+     interface HplTda5250DataControl;
      interface Resource;
! 		interface ResourceRequested;
    }
    uses {
      interface GeneralIO as DATA;
      interface SerialByteComm as Uart;
+     interface HplTda5250DataControl as UartControl;
      interface Resource as UartResource;
!     interface ResourceRequested as UartResourceRequested;
    }
  }
***************
*** 94,104 ****
    }
    
! //   async event void UartResourceRequested.requested() {
! //     signal ResourceRequested.requested(); 
! //   }
! //   
! //   async event void UartResourceRequested.immediateRequested() {
! //     signal ResourceRequested.immediateRequested(); 
! //   }
  
    async command error_t HplTda5250Data.tx(uint8_t data) {
--- 96,106 ----
    }
    
!   async event void UartResourceRequested.requested() {
!     signal ResourceRequested.requested(); 
!   }
!   
!   async event void UartResourceRequested.immediateRequested() {
!     signal ResourceRequested.immediateRequested(); 
!   }
  
    async command error_t HplTda5250Data.tx(uint8_t data) {
***************
*** 119,122 ****
--- 121,137 ----
      signal HplTda5250Data.rxDone(data);
    }
+   
+   async command error_t HplTda5250DataControl.setToTx() {
+     if(call UartResource.isOwner() == FALSE)
+       return FAIL;
+     return call UartControl.setToTx();
+   }
+ 
+   async command error_t HplTda5250DataControl.setToRx() {
+     if(call UartResource.isOwner() == FALSE)
+       return FAIL;
+     return call UartControl.setToRx();
+   }
+ 	
  
    default event void Resource.granted() {}

Index: Tda5250RadioC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/Tda5250RadioC.nc,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** Tda5250RadioC.nc	9 Aug 2006 13:17:06 -0000	1.1.2.7
--- Tda5250RadioC.nc	15 Aug 2006 13:54:06 -0000	1.1.2.8
***************
*** 45,49 ****
      interface SplitControl;
      interface Tda5250Control;
! //     interface ResourceRequested;
      interface RadioByteComm;
    }
--- 45,49 ----
      interface SplitControl;
      interface Tda5250Control;
!     interface ResourceRequested;
      interface RadioByteComm;
    }
***************
*** 61,65 ****
             
    Tda5250Control = Tda5250RadioP;
! //   ResourceRequested = Tda5250RadioP;
    RadioByteComm = Tda5250RadioP;
    SplitControl = Tda5250RadioP;
--- 61,65 ----
             
    Tda5250Control = Tda5250RadioP;
!   ResourceRequested = Tda5250RadioP;
    RadioByteComm = Tda5250RadioP;
    SplitControl = Tda5250RadioP;
***************
*** 69,73 ****
    Tda5250RadioP.ConfigResource -> HplTda5250ConfigC;
    Tda5250RadioP.DataResource -> HplTda5250DataC;
! //   Tda5250RadioP.DataResourceRequested -> HplTda5250DataC;
    
    Tda5250RadioP.HplTda5250Config -> HplTda5250ConfigC;
--- 69,73 ----
    Tda5250RadioP.ConfigResource -> HplTda5250ConfigC;
    Tda5250RadioP.DataResource -> HplTda5250DataC;
!   Tda5250RadioP.DataResourceRequested -> HplTda5250DataC;
    
    Tda5250RadioP.HplTda5250Config -> HplTda5250ConfigC;

Index: Tda5250RadioP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/Tda5250RadioP.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
*** Tda5250RadioP.nc	9 Aug 2006 13:17:06 -0000	1.1.2.9
--- Tda5250RadioP.nc	15 Aug 2006 13:54:06 -0000	1.1.2.10
***************
*** 51,55 ****
      interface Tda5250Control;
      interface RadioByteComm;
! //     interface ResourceRequested;
    }
    uses {
--- 51,55 ----
      interface Tda5250Control;
      interface RadioByteComm;
!     interface ResourceRequested;
    }
    uses {
***************
*** 59,63 ****
      interface Resource as ConfigResource;
      interface Resource as DataResource;
! //     interface ResourceRequested as DataResourceRequested;
      
      interface Alarm<T32khz, uint16_t> as DelayTimer;
--- 59,63 ----
      interface Resource as ConfigResource;
      interface Resource as DataResource;
!     interface ResourceRequested as DataResourceRequested;
      
      interface Alarm<T32khz, uint16_t> as DelayTimer;
***************
*** 215,225 ****
        
        // information for higher layers that the DataResource has been requested
! //       async event void DataResourceRequested.requested() {
! //         signal ResourceRequested.requested();
! //       }
  
! //       async event void DataResourceRequested.immediateRequested() {
! //         signal ResourceRequested.immediateRequested();
! //       }
  
    /**
--- 215,225 ----
        
        // information for higher layers that the DataResource has been requested
!       async event void DataResourceRequested.requested() {
!         signal ResourceRequested.requested();
!       }
  
!       async event void DataResourceRequested.immediateRequested() {
!         signal ResourceRequested.immediateRequested();
!       }
  
    /**
***************
*** 433,440 ****
        }
  
! //       default async event void ResourceRequested.requested() {
! //       }
! //       default async event void ResourceRequested.immediateRequested() {
! //       }
        default async event void Tda5250Control.TimerModeDone(){
        }
--- 433,440 ----
        }
  
!       default async event void ResourceRequested.requested() {
!       }
!       default async event void ResourceRequested.immediateRequested() {
!       }
        default async event void Tda5250Control.TimerModeDone(){
        }