[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420 CC2420ControlC.nc, 1.4, 1.5 CC2420ControlP.nc, 1.5, 1.6 CC2420SpiC.nc, 1.4, 1.5

[Jonathan Hui]

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

Modified Files:
	CC2420ControlC.nc CC2420ControlP.nc CC2420SpiC.nc 
Log Message:

Fix that addresses CC2420 Errata Note 003, rev. 0.3.



Index: CC2420ControlC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/CC2420ControlC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CC2420ControlC.nc	12 Dec 2006 18:23:05 -0000	1.4
--- CC2420ControlC.nc	17 Jan 2007 05:24:52 -0000	1.5
***************
*** 82,85 ****
--- 82,86 ----
    CC2420ControlP.MDMCTRL0 -> Spi.MDMCTRL0;
    CC2420ControlP.MDMCTRL1 -> Spi.MDMCTRL1;
+   CC2420ControlP.RXCTRL1 -> Spi.RXCTRL1;
    CC2420ControlP.PANID -> Spi.PANID;
  

Index: CC2420ControlP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/CC2420ControlP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CC2420ControlP.nc	17 Jan 2007 05:14:18 -0000	1.5
--- CC2420ControlP.nc	17 Jan 2007 05:24:52 -0000	1.6
***************
*** 57,60 ****
--- 57,61 ----
    uses interface CC2420Register as MDMCTRL0;
    uses interface CC2420Register as MDMCTRL1;
+   uses interface CC2420Register as RXCTRL1;
    uses interface CC2420Strobe as SRXON;
    uses interface CC2420Strobe as SRFOFF;
***************
*** 173,176 ****
--- 174,184 ----
  			   ( 1 << CC2420_MDMCTRL0_AUTOACK ) |
  			   ( 2 << CC2420_MDMCTRL0_PREAMBLE_LENGTH ) );
+       call RXCTRL1.write( ( 1 << CC2420_RXCTRL1_RXBPF_LOCUR ) |
+                           ( 1 << CC2420_RXCTRL1_LOW_LOWGAIN ) |
+                           ( 1 << CC2420_RXCTRL1_HIGH_HGM ) |
+                           ( 1 << CC2420_RXCTRL1_LNA_CAP_ARRAY ) |
+                           ( 1 << CC2420_RXCTRL1_RXMIX_TAIL ) |
+                           ( 1 << CC2420_RXCTRL1_RXMIX_VCM ) |
+                           ( 2 << CC2420_RXCTRL1_RXMIX_CURRENT ) );
      }
      return SUCCESS;

Index: CC2420SpiC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/CC2420SpiC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CC2420SpiC.nc	12 Dec 2006 18:23:05 -0000	1.4
--- CC2420SpiC.nc	17 Jan 2007 05:24:52 -0000	1.5
***************
*** 58,61 ****
--- 58,62 ----
    provides interface CC2420Register as MDMCTRL0;
    provides interface CC2420Register as MDMCTRL1;
+   provides interface CC2420Register as RXCTRL1;
    provides interface CC2420Register as TXCTRL;
  
***************
*** 100,103 ****
--- 101,105 ----
    MDMCTRL0 = Spi.Reg[ CC2420_MDMCTRL0 ];
    MDMCTRL1 = Spi.Reg[ CC2420_MDMCTRL1 ];
+   RXCTRL1 = Spi.Reg[ CC2420_RXCTRL1 ];
    TXCTRL = Spi.Reg[ CC2420_TXCTRL ];