[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/pxa27x/ssp HalPXA27xPSPDMAC.nc, 1.1.2.1, 1.1.2.2 HalPXA27xSSPDMAC.nc, 1.1.2.1, 1.1.2.2 HalPXA27xSpiDMAC.nc, 1.1.2.1, 1.1.2.2 HalPXA27xuWireDMAC.nc, 1.1.2.1, 1.1.2.2 HplPXA27xSSPP.nc, 1.1.2.4, 1.1.2.5

[Philip Buonadonna]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HalPXA27xPSPDMAC.nc HalPXA27xSSPDMAC.nc HalPXA27xSpiDMAC.nc 
	HalPXA27xuWireDMAC.nc HplPXA27xSSPP.nc 
Log Message:
Fixes to DMA based components

Index: HalPXA27xPSPDMAC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/ssp/Attic/HalPXA27xPSPDMAC.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
*** HalPXA27xPSPDMAC.nc	17 Jul 2006 19:44:57 -0000	1.1.2.1
--- HalPXA27xPSPDMAC.nc	17 Jul 2006 21:17:56 -0000	1.1.2.2
***************
*** 57,66 ****
    components HalPXA27xSSPControlP;
  
!   Init = HalPXA27xSpiPioM;
!   SpiByte = HalPXA27xSpiPioM;
!   SpiPacket = HalPXA27xSpiPioM;
    HalPXA27xSSPCntl = HalPXA27xSSPControlP;
  
!   SSP = HalPXA27xSpiPioM;
    SSP = HalPXA27xSSPControlP;
    RxDMA = HalPXA27xSpiDMAM;
--- 57,66 ----
    components HalPXA27xSSPControlP;
  
!   Init = HalPXA27xSpiSSPM;
!   SpiByte = HalPXA27xSpiSSPM;
!   SpiPacket = HalPXA27xSpiSSPM;
    HalPXA27xSSPCntl = HalPXA27xSSPControlP;
  
!   SSP = HalPXA27xSpiSSPM;
    SSP = HalPXA27xSSPControlP;
    RxDMA = HalPXA27xSpiDMAM;

Index: HalPXA27xSSPDMAC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/ssp/Attic/HalPXA27xSSPDMAC.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
*** HalPXA27xSSPDMAC.nc	17 Jul 2006 19:44:58 -0000	1.1.2.1
--- HalPXA27xSSPDMAC.nc	17 Jul 2006 21:17:56 -0000	1.1.2.2
***************
*** 57,66 ****
    components HalPXA27xSSPControlP;
  
!   Init = HalPXA27xSpiPioM;
!   SpiByte = HalPXA27xSpiPioM;
!   SpiPacket = HalPXA27xSpiPioM;
    HalPXA27xSSPCntl = HalPXA27xSSPControlP;
  
!   SSP = HalPXA27xSpiPioM;
    SSP = HalPXA27xSSPControlP;
    RxDMA = HalPXA27xSpiDMAM;
--- 57,66 ----
    components HalPXA27xSSPControlP;
  
!   Init = HalPXA27xSpiDMAM;
!   SpiByte = HalPXA27xSpiDMAM;
!   SpiPacket = HalPXA27xSpiDMAM;
    HalPXA27xSSPCntl = HalPXA27xSSPControlP;
  
!   SSP = HalPXA27xSpiDMAM;
    SSP = HalPXA27xSSPControlP;
    RxDMA = HalPXA27xSpiDMAM;

Index: HalPXA27xSpiDMAC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/ssp/Attic/HalPXA27xSpiDMAC.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
*** HalPXA27xSpiDMAC.nc	17 Jul 2006 19:44:58 -0000	1.1.2.1
--- HalPXA27xSpiDMAC.nc	17 Jul 2006 21:17:56 -0000	1.1.2.2
***************
*** 57,71 ****
    components HalPXA27xSSPControlP;
  
!   Init = HalPXA27xSpiPioM;
!   SpiByte = HalPXA27xSpiPioM;
!   SpiPacket = HalPXA27xSpiPioM;
    HalPXA27xSSPCntl = HalPXA27xSSPControlP;
  
!   SSP = HalPXA27xSpiPioM;
    SSP = HalPXA27xSSPControlP;
!   RxDMA = HalPXA27xSpiDMAM;
!   TxDMA = HalPXA27xSpiDMAM;
!   SSPRxDMAInfo = HalPXA27xSpiDMAM;
!   SSPTxDMAInfo = HalPXA27xSpiDMAM;
  
  }
--- 57,71 ----
    components HalPXA27xSSPControlP;
  
!   Init = HalPXA27xSpiDMAM;
!   SpiByte = HalPXA27xSpiDMAM;
!   SpiPacket = HalPXA27xSpiDMAM;
    HalPXA27xSSPCntl = HalPXA27xSSPControlP;
  
!   SSP = HalPXA27xSpiDMAM;
    SSP = HalPXA27xSSPControlP;
!   RxDMA = HalPXA27xSpiDMAM.RxDMA;
!   TxDMA = HalPXA27xSpiDMAM.TxDMA;
!   SSPRxDMAInfo = HalPXA27xSpiDMAM.SSPRxDMAInfo;
!   SSPTxDMAInfo = HalPXA27xSpiDMAM.SSPTxDMAInfo;
  
  }

Index: HalPXA27xuWireDMAC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/ssp/Attic/HalPXA27xuWireDMAC.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
*** HalPXA27xuWireDMAC.nc	17 Jul 2006 19:44:58 -0000	1.1.2.1
--- HalPXA27xuWireDMAC.nc	17 Jul 2006 21:17:57 -0000	1.1.2.2
***************
*** 57,66 ****
    components HalPXA27xSSPControlP;
  
!   Init = HalPXA27xSpiPioM;
!   SpiByte = HalPXA27xSpiPioM;
!   SpiPacket = HalPXA27xSpiPioM;
    HalPXA27xSSPCntl = HalPXA27xSSPControlP;
  
!   SSP = HalPXA27xSpiPioM;
    SSP = HalPXA27xSSPControlP;
    RxDMA = HalPXA27xSpiDMAM;
--- 57,66 ----
    components HalPXA27xSSPControlP;
  
!   Init = HalPXA27xSpiDMAM;
!   SpiByte = HalPXA27xSpiDMAM;
!   SpiPacket = HalPXA27xSpiDMAM;
    HalPXA27xSSPCntl = HalPXA27xSSPControlP;
  
!   SSP = HalPXA27xSpiDMAM;
    SSP = HalPXA27xSSPControlP;
    RxDMA = HalPXA27xSpiDMAM;

Index: HplPXA27xSSPP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/ssp/HplPXA27xSSPP.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** HplPXA27xSSPP.nc	17 Jul 2006 19:44:58 -0000	1.1.2.4
--- HplPXA27xSSPP.nc	17 Jul 2006 21:17:57 -0000	1.1.2.5
***************
*** 275,279 ****
  
    default async event void HplPXA27xSSP.interruptSSP[uint8_t chnl]() {
!     call SSP.setSSSR(SSSR_BCE | SSSR_TUR | SSSR_EOC | SSSR_TINT | 
  		     SSSR_PINT | SSSR_ROR );
      return;
--- 275,279 ----
  
    default async event void HplPXA27xSSP.interruptSSP[uint8_t chnl]() {
!     call HplPXA27xSSP.setSSSR[chnl](SSSR_BCE | SSSR_TUR | SSSR_EOC | SSSR_TINT | 
  		     SSSR_PINT | SSSR_ROR );
      return;