X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusci%2FHplMsp430UsciReg.nc;h=4a61bbbd89bb4f4021f15f207ca8efdc8df33097;hb=3fe8f13e05a2bcbc4a224f5a7b7f0ae45398a9b5;hp=1d80fdaf25647464b8ae519a8fe3f577742d1251;hpb=0290d9081acdbe813926612478fbe81e7a44e3c5;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/usci/HplMsp430UsciReg.nc b/tos/chips/msp430/usci/HplMsp430UsciReg.nc
index 1d80fdaf..4a61bbbd 100644
--- a/tos/chips/msp430/usci/HplMsp430UsciReg.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciReg.nc
@@ -10,7 +10,7 @@
  * - Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * - Neither the name of the Technische Universität Berlin nor the names
+ * - Neither the name of the Titanium Mirror, Inc. nor the names
  *   of its contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
  *
@@ -26,13 +26,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 /**
  * HPL interface to a USCI peripheral device in UART mode.
  *
  * @author R. Steve McKown <rsmckown@gmail.com>
  */
- 
+
 #include "Msp430Usci.h"
 
 interface HplMsp430UsciReg {
@@ -224,28 +224,18 @@ interface HplMsp430UsciReg {
   async command void assignIrrctl(uint8_t value);
 
   /**
-   * Manipulate bits in the UCxxI2COA register.  See the methods that
-   * manipulate UCxxCTL0 for more information.  These methods perform no
-   * operation on providers implementing a USCI_Ax device.
+   * Access to the UCBxI2COA register.
    */
   async command volatile uint8_t* ptrI2Coa();
-  async command uint8_t getI2Coa(uint8_t mask);
-  async command void setI2Coa(uint8_t mask);
-  async command void clrI2Coa(uint8_t mask);
-  //async command void assignI2Coa(uint8_t mask, uint8_t value);
-  async command void assignI2Coa(uint8_t value);
+  async command uint16_t readI2Coa();
+  async command void assignI2Coa(uint16_t addr);
 
   /**
-   * Manipulate bits in the UCxxI2COA register.  See the methods that
-   * manipulate UCxxCTL0 for more information.  These methods perform no
-   * operation on providers implementing a USCI_Ax device.
+   * Access to the UCBxI2SA register.
    */
   async command volatile uint8_t* ptrI2Csa();
-  async command uint8_t getI2Csa(uint8_t mask);
-  async command void setI2Csa(uint8_t mask);
-  async command void clrI2Csa(uint8_t mask);
-  //async command void assignI2Csa(uint8_t mask, uint8_t value);
-  async command void assignI2Csa(uint8_t value);
+  async command uint16_t readI2Csa();
+  async command void assignI2Csa(uint16_t addr);
 
   /**
    * Manipulate bits in the UCxxIE register.  See the methods that manipulate
@@ -263,6 +253,9 @@ interface HplMsp430UsciReg {
    * UCxxCTL0 for more information.
    */
   async command bool getIfgRx();
+  async command void setIfgRx();
   async command void clrIfgRx();
   async command bool getIfgTx();
+  async command void setIfgTx();
+  async command void clrIfgTx();
 }