[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/xe1205 XE1205SpiImplP.nc, 1.1.2.3, 1.1.2.4

[Jonathan Hui]

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

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

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



Index: XE1205SpiImplP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/xe1205/XE1205SpiImplP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** XE1205SpiImplP.nc	15 Aug 2006 11:59:09 -0000	1.1.2.3
--- XE1205SpiImplP.nc	28 Sep 2006 19:26:22 -0000	1.1.2.4
***************
*** 234,239 ****
    async command void Reg.read[uint8_t addr](uint8_t* data) 
    {
-     error_t status;
- 
  #if 1
      if (call NssDataPin.get() != TRUE || call NssConfigPin.get() != TRUE)
--- 234,237 ----
***************
*** 243,248 ****
      call NssDataPin.set();
      call NssConfigPin.clr();
!     call SpiByte.write(XE1205_READ(addr), &status);
!     call SpiByte.write(0, data);
      call NssConfigPin.set();
    }
--- 241,246 ----
      call NssDataPin.set();
      call NssConfigPin.clr();
!     call SpiByte.write(XE1205_READ(addr));
!     *data = call SpiByte.write(0);
      call NssConfigPin.set();
    }
***************
*** 250,255 ****
    async command void Reg.write[uint8_t addr](uint8_t data) 
    {
-     error_t status;
- 
  #if 1
      if (call NssDataPin.get() != TRUE || call NssConfigPin.get() != TRUE)
--- 248,251 ----
***************
*** 259,264 ****
      call NssDataPin.set();
      call NssConfigPin.clr();
!     call SpiByte.write(XE1205_WRITE(addr), &status);
!     call SpiByte.write(data, &status);
      call NssConfigPin.set();
    }
--- 255,260 ----
      call NssDataPin.set();
      call NssConfigPin.clr();
!     call SpiByte.write(XE1205_WRITE(addr));
!     call SpiByte.write(data);
      call NssConfigPin.set();
    }