From: janhauer Date: Tue, 5 May 2009 16:56:49 +0000 (+0000) Subject: - removed some unused code X-Git-Tag: rc_6_tinyos_2_1_1~396 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=a83f67f4c22cb8c822537e525e1d254f11c7fdb6 - removed some unused code --- diff --git a/tos/chips/cc2420_tkn154/CC2420ControlP.nc b/tos/chips/cc2420_tkn154/CC2420ControlP.nc index ab122287..030f8afc 100644 --- a/tos/chips/cc2420_tkn154/CC2420ControlP.nc +++ b/tos/chips/cc2420_tkn154/CC2420ControlP.nc @@ -157,31 +157,6 @@ implementation { signal Resource.granted(); } - 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() { atomic { diff --git a/tos/chips/cc2420_tkn154/CC2420ReceiveP.nc b/tos/chips/cc2420_tkn154/CC2420ReceiveP.nc index d8f8386f..fddf5dd6 100644 --- a/tos/chips/cc2420_tkn154/CC2420ReceiveP.nc +++ b/tos/chips/cc2420_tkn154/CC2420ReceiveP.nc @@ -210,29 +210,6 @@ implementation { signal AsyncSplitControl.stopDone(SUCCESS); } - 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 ****************/ /** * Start frame delimiter signifies the beginning/end of a packet @@ -281,30 +258,6 @@ implementation { } } - 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 ****************/ /** * We received some bytes from the SPI bus. Process them in the context