[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420_tkn154 CC2420ControlP.nc, 1.4, 1.5 CC2420ReceiveP.nc, 1.3, 1.4

[Jan-Hinrich Hauer]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1688/tos/chips/cc2420_tkn154

Modified Files:
	CC2420ControlP.nc CC2420ReceiveP.nc 
Log Message:
- removed some unused code

Index: CC2420ControlP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420ControlP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CC2420ControlP.nc	24 Mar 2009 12:56:46 -0000	1.4
--- CC2420ControlP.nc	5 May 2009 16:56:49 -0000	1.5
***************
*** 158,186 ****
    }
  
-   void switchToUnbufferedMode()
-   {
-     uint16_t mdmctrol1;
-     call CSN.set();
-     call CSN.clr();
-     call MDMCTRL1.read(&mdmctrol1);
-     call CSN.set();
-     mdmctrol1 &= ~0x0003;
-     mdmctrol1 |= 0x0000;
-     call CSN.clr();
-     call MDMCTRL1.write(mdmctrol1);
-     call CSN.set();
-   }
- 
-   void switchToBufferedMode()
-   {
-     uint16_t mdmctrol1;
-     call CSN.set();
-     call CSN.clr();
-     call MDMCTRL1.read(&mdmctrol1);
-     mdmctrol1 &= ~0x03;
-     call MDMCTRL1.write(mdmctrol1);
-     call CSN.set();
-   }
- 
    /***************** CC2420Power Commands ****************/
    async command error_t CC2420Power.startVReg() {
--- 158,161 ----

Index: CC2420ReceiveP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420ReceiveP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CC2420ReceiveP.nc	4 Mar 2009 18:31:06 -0000	1.3
--- CC2420ReceiveP.nc	5 May 2009 16:56:49 -0000	1.4
***************
*** 211,237 ****
    }
  
-   void switchToUnbufferedMode()
-   {
-     uint16_t mdmctrol1;
-     call CSN.set();
-     call CSN.clr();
-     call MDMCTRL1.read(&mdmctrol1);
-     mdmctrol1 &= ~0x03;
-     mdmctrol1 |= 0x01;
-     call MDMCTRL1.write(mdmctrol1);
-     call CSN.set();
-   }
- 
-   void switchToBufferedMode()
-   {
-     uint16_t mdmctrol1;
-     call CSN.set();
-     call CSN.clr();
-     call MDMCTRL1.read(&mdmctrol1);
-     mdmctrol1 &= ~0x03;
-     call MDMCTRL1.write(mdmctrol1);
-     call CSN.set();
-   }
- 
    /***************** CC2420Receive Commands ****************/
    /**
--- 211,214 ----
***************
*** 282,309 ****
    }
    
-   uint8_t mhrLength(uint8_t *fcf)
-   {
-     uint8_t idCompression;
-     uint8_t len = MHR_INDEX_ADDRESS;
-  
-     if (fcf[MHR_INDEX_FC1] & FC1_SECURITY_ENABLED)
-       return 0xFF; // not supported 
-     idCompression = (fcf[0] & FC1_PAN_ID_COMPRESSION);
-     if (fcf[MHR_INDEX_FC2] & 0x08){ // short or ext. address
-       len += 4; // pan id + short address
-       if (fcf[MHR_INDEX_FC2] & 0x04) // ext. address
-         len += 6; // diff to short address
-     }
-     if (fcf[MHR_INDEX_FC2] & 0x80){ // short or ext. address
-       len += 2;
-       if (!idCompression)
-         len += 2;
-       if (fcf[MHR_INDEX_FC2] & 0x40) // ext. address
-         len += 6; // diff to short address
-     }
-     return len;
-   }
-     
-   
    /***************** RXFIFO Events ****************/
    /**
--- 259,262 ----