[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/pxa27x/ssp HalPXA27xSpiDMAM.nc, 1.1.2.6, 1.1.2.7 HalPXA27xSpiPioM.nc, 1.1.2.7, 1.1.2.8

[Jonathan Hui]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HalPXA27xSpiDMAM.nc HalPXA27xSpiPioM.nc 
Log Message:

Changes to SpiByte interface. Return received byte since error_t is no
longer returned.



Index: HalPXA27xSpiDMAM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/ssp/HalPXA27xSpiDMAM.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** HalPXA27xSpiDMAM.nc	16 Aug 2006 18:20:53 -0000	1.1.2.6
--- HalPXA27xSpiDMAM.nc	28 Sep 2006 19:26:22 -0000	1.1.2.7
***************
*** 90,94 ****
    }
  
!   async command void SpiByte.write(uint8_t tx, uint8_t* rx) {
      volatile uint32_t tmp;
      volatile uint8_t val;
--- 90,94 ----
    }
  
!   async command uint8_t SpiByte.write(uint8_t tx) {
      volatile uint32_t tmp;
      volatile uint8_t val;
***************
*** 104,108 ****
      val = call SSP.getSSDR();
  
!     if (rx != NULL) *rx = val;
    }
  
--- 104,108 ----
      val = call SSP.getSSDR();
  
!     return val;
    }
  

Index: HalPXA27xSpiPioM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/ssp/HalPXA27xSpiPioM.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
*** HalPXA27xSpiPioM.nc	16 Aug 2006 18:19:50 -0000	1.1.2.7
--- HalPXA27xSpiPioM.nc	28 Sep 2006 19:26:22 -0000	1.1.2.8
***************
*** 107,111 ****
    }
  
!   async command void SpiByte.write(uint8_t tx, uint8_t* rx) {
      volatile uint32_t tmp;
      volatile uint8_t val;
--- 107,111 ----
    }
  
!   async command uint8_t SpiByte.write(uint8_t tx) {
      volatile uint32_t tmp;
      volatile uint8_t val;
***************
*** 120,125 ****
  
      val = call SSP.getSSDR();
! 
!     if (rx != NULL) *rx = val;
    }
  
--- 120,125 ----
  
      val = call SSP.getSSDR();
!     
!     return val;
    }