Merge tag 'release/2.1.1-4.5' into debian/2.1.1

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

diff --git a/tos/chips/msp430/usci/HplMsp430UsciRegP.nc b/tos/chips/msp430/usci/HplMsp430UsciRegP.nc
index 3dcaf9caae90fe48973316cf5252b931de175f0a..32f3de12af105417770420d077ecb9dd1c0ffc95 100644 (file)
--- a/tos/chips/msp430/usci/HplMsp430UsciRegP.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciRegP.nc
@@ -185,7 +185,7 @@ implementation
     }
   }
 
-  /* Doesn't really set the mode, but checks the most for the device and inits
+  /* Doesn't really set the mode, but checks the mode for the device and inits
    * the device.
    */
   async command bool Registers.setMode(msp430_usci_mode_t mode)
@@ -236,8 +236,38 @@ implementation
   RENDER_A(Abctl);
   RENDER_A(Irtctl);
   RENDER_A(Irrctl);
-  RENDER_B(I2Coa);
-  RENDER_B(I2Csa);
+
+  /* RENDER_B(I2Coa); */
+  async command volatile uint8_t* Registers.ptrI2Coa()
+  {
+    return &UCBxI2Coa;
+  }
+
+  async command uint16_t Registers.readI2Coa()
+  {
+    return UCBxI2Coa;
+  }
+
+  async command void Registers.assignI2Coa(uint16_t addr)
+  {
+    UCBxI2Coa = addr;
+  }
+
+  /* RENDER_B(I2Csa); */
+  async command volatile uint8_t* Registers.ptrI2Csa()
+  {
+    return &UCBxI2Csa;
+  }
+
+  async command uint16_t Registers.readI2Csa()
+  {
+    return UCBxI2Csa;
+  }
+
+  async command void Registers.assignI2Csa(uint16_t addr)
+  {
+    UCBxI2Csa = addr;
+  }
 
   /* RENDER(Ie); */
   async command bool Registers.getIeRx()
@@ -285,4 +315,9 @@ implementation
   {
     return READ_FLAG(UCxxIfg, UCxxTXIFG);
   }
+
+  async command void Registers.clrIfgTx()
+  {
+    CLR_FLAG(UCxxIfg, UCxxTXIFG);
+  }
 }