From f764986e6bce7165477913c61ce86b7433474f56 Mon Sep 17 00:00:00 2001
From: idgay <idgay>
Date: Fri, 9 Feb 2007 21:30:29 +0000
Subject: [PATCH] misc minor fixes

---
 apps/tests/storage/Block/README.txt   | 8 ++++----
 tos/chips/cc1000/LowPowerListening.nc | 2 ++
 tos/chips/cc1000_lpl/CC1000RssiP.nc   | 5 ++---
 tos/lib/net/ctp/CollectionSenderC.nc  | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/tests/storage/Block/README.txt b/apps/tests/storage/Block/README.txt
index 1bda98b9..8ca95426 100644
--- 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 c8649c85..94c7dcd1 100644
--- 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 01126abd..89d7f636 100644
--- 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) {
     atomic
       {
-	/* The code assumes that RSSI measurements are 10-bits 
-	   (legacy effect) */
-	signal Rssi.readDone[currentOp](result, data >> 6);
+	/* The RSSI measurements are assumed to be 10-bits */
+	signal Rssi.readDone[currentOp](result, data);
 	startNextOp();
       }
   }
diff --git a/tos/lib/net/ctp/CollectionSenderC.nc b/tos/lib/net/ctp/CollectionSenderC.nc
index 9fae7b13..721f44e5 100644
--- 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 {
-- 
2.39.2