Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / msp430 / usci / HplMsp430UsciInt.nc

diff --git a/tos/chips/msp430/usci/HplMsp430UsciInt.nc b/tos/chips/msp430/usci/HplMsp430UsciInt.nc
index 19e1e6df91305747414b51b30543b5acae598262..b5cb0c85209b4cb125022f04ddbdeeaa978d4ac9 100644 (file)
--- a/tos/chips/msp430/usci/HplMsp430UsciInt.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciInt.nc
@@ -26,18 +26,18 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 /**
  * Interrupt interface for USCI peripherals.  Although A and B devices have
  * different interrupt sets since B only support I2C, we use a single set for
  * both so that upper layers need not deal with the different sets.  This is
  * critical in the case of SPI communications, which is supported by both A
  * and B devices.
- * 
+ *
  * @author R. Steve McKown <rsmckown@gmail.com>
  */
- 
-#include "msp430usci.h"
+
+#include "Msp430Usci.h"
 
 interface HplMsp430UsciInt {
   /**
@@ -51,9 +51,9 @@ interface HplMsp430UsciInt {
    * Signals a character received for any USCI mode.  The provider must reset
    * UCxIFG.UCxxRXIFG before signalling the event to the user.
    *
-   * @params c The character received.
+   * @params byte The character received.
    */
-  async event void rx(char c);
+  async event void rx(uint8_t byte);
 
   /**
    * Signals that the device's transmit buffer is empty and can accept