[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250 HplTda5250DataC.nc, 1.1.2.2, 1.1.2.3 HplTda5250DataP.nc, 1.1.2.10, 1.1.2.11

[Philipp Huppertz]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HplTda5250DataC.nc HplTda5250DataP.nc 
Log Message:
- updated to new Uart interfaces

Index: HplTda5250DataC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/Attic/HplTda5250DataC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** HplTda5250DataC.nc	15 Aug 2006 13:54:06 -0000	1.1.2.2
--- HplTda5250DataC.nc	11 Oct 2006 11:50:49 -0000	1.1.2.3
***************
*** 57,64 ****
    ResourceRequested = HplTda5250DataP.ResourceRequested;
    HplTda5250Data = HplTda5250DataP;
! 	HplTda5250DataControl = HplTda5250DataIOC;
  
    HplTda5250DataP.DATA -> Tda5250RadioIOC.Tda5250RadioDATA;
! 	HplTda5250DataP.Uart -> HplTda5250DataIOC.SerialByteComm;
  	HplTda5250DataP.UartResource -> HplTda5250DataIOC.Resource;
  	HplTda5250DataP.UartResourceRequested -> HplTda5250DataIOC.ResourceRequested;
--- 57,65 ----
    ResourceRequested = HplTda5250DataP.ResourceRequested;
    HplTda5250Data = HplTda5250DataP;
!   HplTda5250DataControl = HplTda5250DataP;
  
    HplTda5250DataP.DATA -> Tda5250RadioIOC.Tda5250RadioDATA;
! 	HplTda5250DataP.Uart -> HplTda5250DataIOC.UartStream;
!   HplTda5250DataP.UartDataControl -> HplTda5250DataIOC.UartDataControl;
  	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.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** HplTda5250DataP.nc	15 Aug 2006 13:54:06 -0000	1.1.2.10
--- HplTda5250DataP.nc	11 Oct 2006 11:50:49 -0000	1.1.2.11
***************
*** 49,54 ****
    uses {
      interface GeneralIO as DATA;
!     interface SerialByteComm as Uart;
!     interface HplTda5250DataControl as UartControl;
      interface Resource as UartResource;
      interface ResourceRequested as UartResourceRequested;
--- 49,54 ----
    uses {
      interface GeneralIO as DATA;
!     interface UartStream as Uart;
!     interface HplTda5250DataControl as UartDataControl;
      interface Resource as UartResource;
      interface ResourceRequested as UartResourceRequested;
***************
*** 107,129 ****
      if(call UartResource.isOwner() == FALSE)
        return FAIL;
!     return call Uart.put(data);
    }
  
!   async event void Uart.putDone() {
      if(call UartResource.isOwner() == FALSE)
        return;
      signal HplTda5250Data.txReady();
    }
! 
!   async event void Uart.get(uint8_t data) {
!     if(call UartResource.isOwner() == FALSE)
!       return;
!     signal HplTda5250Data.rxDone(data);
!   }
    
    async command error_t HplTda5250DataControl.setToTx() {
      if(call UartResource.isOwner() == FALSE)
        return FAIL;
!     return call UartControl.setToTx();
    }
  
--- 107,132 ----
      if(call UartResource.isOwner() == FALSE)
        return FAIL;
!     return call Uart.send(&data, 1);
    }
  
!   async event void Uart.sendDone( uint8_t* buf, uint16_t len, error_t error ) {
      if(call UartResource.isOwner() == FALSE)
        return;
      signal HplTda5250Data.txReady();
    }
!   
!   async event void Uart.receivedByte( uint8_t data ) {
!   	if(call UartResource.isOwner() == FALSE)
!    	 return;
!   	signal HplTda5250Data.rxDone(data);
! 	}
!   async event void Uart.receiveDone( uint8_t* buf, uint16_t len, error_t error ) {}
    
    async command error_t HplTda5250DataControl.setToTx() {
      if(call UartResource.isOwner() == FALSE)
        return FAIL;
!     call UartDataControl.setToTx();
!     call Uart.disableReceiveInterrupt();
!     return SUCCESS;
    }
  
***************
*** 131,138 ****
      if(call UartResource.isOwner() == FALSE)
        return FAIL;
!     return call UartControl.setToRx();
    }
  	
- 
    default event void Resource.granted() {}
    default async event void HplTda5250Data.txReady() {}
--- 134,142 ----
      if(call UartResource.isOwner() == FALSE)
        return FAIL;
!     call UartDataControl.setToRx();
!     call Uart.enableReceiveInterrupt();
!     return SUCCESS;
    }
  	
    default event void Resource.granted() {}
    default async event void HplTda5250Data.txReady() {}