misc minor fixes

diff --git a/apps/tests/storage/Block/README.txt b/apps/tests/storage/Block/README.txt
index 1bda98b93aa6d8c93890795e9cd15a476ec815d8..8ca95426a3a1ea844899b185bcfa9a5812b25751 100644 (file)
--- a/apps/tests/storage/Block/README.txt
+++ b/apps/tests/storage/Block/README.txt
@@ -18,10 +18,10 @@ For example, install with an id of 310 to write some data to the flash,
 then with an id of 210 to check that the data is correct. Or install
 with an id of 10 to do a combined write+read test.
 
-A successful test will blink the yellow led a few times, then turn on
-the green led. A failed test will turn on the red led. A serial message
-whose last byte is 0x80 for success and all other values indicate
-failure is also sent at the end of the test.
+A successful test will blink LED 2 a few times, then turn on LED 1. A
+failed test will turn on LED 0. A serial message whose last byte is 0x80
+for success and all other values indicate failure is also sent at the
+end of the test.
 
 Tools:
 

diff --git a/tos/chips/cc1000/LowPowerListening.nc b/tos/chips/cc1000/LowPowerListening.nc
index c8649c85edf6ec1ac5f7196e3c7a23585daa54e8..94c7dcd19bfed3c90410db3370e5692316efd944 100644 (file)
--- a/tos/chips/cc1000/LowPowerListening.nc
+++ b/tos/chips/cc1000/LowPowerListening.nc
@@ -35,6 +35,8 @@
  * @author David Moss
  * @author Jonathan Hui
  */
+
+#include <message.h>
  
 interface LowPowerListening {
 

diff --git a/tos/chips/cc1000_lpl/CC1000RssiP.nc b/tos/chips/cc1000_lpl/CC1000RssiP.nc
index 01126abdedfbf08d435c08970468bbeaacac3748..89d7f63625453343629d6cd79a1135df3a7f30fd 100644 (file)
--- a/tos/chips/cc1000_lpl/CC1000RssiP.nc
+++ b/tos/chips/cc1000_lpl/CC1000RssiP.nc
@@ -100,9 +100,8 @@ implementation
   async event void ActualRssi.readDone(error_t result, uint16_t data) {\r
     atomic\r
       {\r
-       /* The code assumes that RSSI measurements are 10-bits \r
-          (legacy effect) */\r
-       signal Rssi.readDone[currentOp](result, data >> 6);\r
+       /* The RSSI measurements are assumed to be 10-bits */\r
+       signal Rssi.readDone[currentOp](result, data);\r
        startNextOp();\r
       }\r
   }\r

diff --git a/tos/lib/net/ctp/CollectionSenderC.nc b/tos/lib/net/ctp/CollectionSenderC.nc
index 9fae7b13d388536c87c1de30c1cfd7001d452557..721f44e5829d3049389c2404170d2cb84f5914cf 100644 (file)
--- a/tos/lib/net/ctp/CollectionSenderC.nc
+++ b/tos/lib/net/ctp/CollectionSenderC.nc
@@ -7,7 +7,7 @@
  * @see TinyOS Net2-WG
  */
 
-#include <Collection.h>
+#include <Ctp.h>
 
 generic configuration CollectionSenderC(collection_id_t collectid) {
   provides {